diff options
Diffstat (limited to 'pkgs/applications')
1668 files changed, 67175 insertions, 74832 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..05d8af554a050 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,7 +5,6 @@ , meson , ninja , pkg-config -, gnome , gnome-desktop , glib , gtk3 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/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..0466742b61981 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -207,6 +207,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.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/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index 475ecd26e706a..8318a4936ed94 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -12,13 +12,13 @@ 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; }; diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index dce352a866885..b5d52dce18560 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -5,7 +5,7 @@ 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"; }; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index beca5afc721da..4069b541eb179 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"; - 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-qAJztvNI3uGmQfECJJ7tJ/xLLgMU5OiW0O3ZSJhvt0k="; }; 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; [ eelco 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..b313bc04782ef 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"; - 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-J9jgBl8J4W9Yvrlg1KlzYgGTmdxUZM9L11rCftKFSlE="; }; 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..bdedb3b9579b1 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,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.5.1"; + version = "3.6.1"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc="; + hash = "sha256-MZ/u4wUUhDo1Mm9jxOY4MtzeV2797meT4HjYi5bCSM0="; }; postPatch = '' @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg_6 + ffmpeg_7 file flac gtk3 @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.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 '' diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 6127cb7e69291..ef0560fdc2ad1 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.jpj.net/~trevor/aumix.html"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + 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/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 92ee1de47e7c7..4aab7dface2a0 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"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg="; + hash = "sha256:0cnjwgjbpyrb4pd0841zbhy84ps7gkmq3j148ga826nrxnw082pi"; }; 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/carla/default.nix b/pkgs/applications/audio/carla/default.nix index b13ffdeb24c1d..51f8144ae5c25 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "falkTX"; - repo = finalAttrs.pname; + repo = "carla"; rev = "v${finalAttrs.version}"; hash = "sha256-H15T/z/IRfgWdqToTzq2eJ7q3n9Kj44IZXsd4uaipuU="; }; 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/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/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/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..ff81d76892275 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -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/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/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/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 3bd6f3138146c..e3f5f4580d6fa 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://gmpclient.org"; description = "GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; - maintainers = []; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index eff5bd76c9f22..61e33cae90268 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -6,13 +6,12 @@ , gobject-introspection , gtk3 , intltool -, python3 -, python3Packages +, python311Packages , wrapGAppsHook3 , xdg-utils }: -python3Packages.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "gpodder"; version = "3.11.4"; format = "other"; @@ -40,12 +39,11 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - python3 gtk3 adwaita-icon-theme ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python311Packages; [ minimock pytest pytest-httpserver @@ -54,7 +52,7 @@ python3Packages.buildPythonApplication rec { doCheck = true; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ feedparser dbus-python mygpoclient diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 247a3bb23ecb1..5b23b0e34a219 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -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 79f0c61af78e7..45cf34588948d 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; + hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; }; buildInputs = [ 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 3dd4a3006b2b9..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; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index 1a99287348276..5b6cdf7e79046 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 @@ -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..e54828e3cdcf9 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.3.1"; 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-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA="; }; 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..11fb94dc0815e 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 [ 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/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..593fd72c6d0ce 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -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..46ece80638f6a 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA="; }; - cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; + cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.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/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..6ed4a2efef60b 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -18,7 +18,7 @@ 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 ]; 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..4244a9b62ae9c --- /dev/null +++ b/pkgs/applications/audio/mbrola/voices.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + unstableGitUpdater, + 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..9551e0dda3b23 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 ]; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 42d4c38d47a30..5714de0ee7b43 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/magnush/mhwaveedit"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } 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/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/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 0f65d5cea8c7c..8ef52e90f7909 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -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/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/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 ca6ab3d2bee61..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; [ ]; + 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 aac6ec43c305e..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; [ ]; + 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/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/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 6fce76e9a4818..93594c86052be 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "16.0.0"; + version = "17.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-LYD1qjSlwv9wGBrZUaYz6Zcvl2n6cLi2aGycr4ZJWdY="; + sha256 = "sha256-/8IDwzgZzf63MvXTBP2CoC5IHi7Umr3exU1/oDdadgk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d5abb66d23981..4053a1a88f6b1 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -20,16 +20,16 @@ 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; 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/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..5c48f08dcd7ce 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 ? [] diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index c188465f52e99..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; [ ]; + 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 289991a944316..3e16c7b512de8 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -13,13 +13,13 @@ 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; @@ -83,7 +83,7 @@ buildDotnetModule rec { # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT unfreeRedistributable ]; - maintainers = with maintainers; [ ]; + 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/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f6b8d20f91d2c..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 -, adwaita-icon-theme -, 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 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/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/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..75d5dc09a6139 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,5 +1,7 @@ { lib -, python3Packages +# Python 3.12 demonstrates a peculiar segmentation fault with pyqt5. Using +# pyqt6 with Python 3.12 should work, but this is not released yet. +, python311Packages , fetchFromGitHub , chromaprint @@ -11,7 +13,7 @@ }: let - pythonPackages = python3Packages; + pythonPackages = python311Packages; pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia @@ -20,14 +22,15 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.11"; + # nix-update --commit picard --version-regex 'release-(.*)' + version = "2.12"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-2RGKHJKJ/QXR6Rehch4r1UtI+frRXa4G+n0bUmCGSu8="; + hash = "sha256-+++NDJzXw4tA5eQd24r+l3UK3YS8Jy1t9WNiEU9sH0Q="; }; nativeBuildInputs = [ 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/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index ec79cbefabf0f..b3475b4c3d0ee 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.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; + hash = "sha512-t5ImqZvwKrZoobXFHX8wfQBQBPnAp4rJq4p1GLG/6CxAeKYuYMTPr7+xjwVqhGm/DGw7vSVY9sdMyFodq8rJ2A=="; }; 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/74"; license = licenses.unfree; maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; 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/praat/default.nix b/pkgs/applications/audio/praat/default.nix index fb27f769f8975..119983971be3c 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.13"; + version = "6.4.14"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-rvaW4ifXZNAmON+2OZR2JLGPzaTEzk2miKeFHQ7Bp6M="; + hash = "sha256-AY/OSoCWlWSjtLcve16nL72HidPlJqJgAOvUubMqvj0="; }; 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..9cf419f0b763c 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-07-29"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50"; - hash = "sha256-bttF+yX1BT4t1TUmJBs0OZuPD+6uPxHlb8YzRIVNKTQ="; + rev = "d895cb94623d320f79b364a8f63ab518fddf697b"; + hash = "sha256-LsveuaDmRvC9TUON847QdzqQDUW1zd37++MbtXrfJjk="; }; 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..f6e55ce297183 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 = "d895cb94623d320f79b364a8f63ab518fddf697b"; +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..3ebe1375671f4 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -22,9 +22,13 @@ stdenv.mkDerivation (finalAttrs: { 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..a335dabf4abc0 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -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/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 2c761897ce893..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.4"; + version = "0.7.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-1YExpvhCHIdRqFCvOmiG3G7k/qs7q1ITwtZXGMc/SRk="; + 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/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..ee994b56efb0a 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -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 16786c77e4c6b..96e849b406e2c 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.17"; + version = "7.19"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-4+8MhvQ1LhfyhFCOMBgD4HHt0Oaj25y2U04++JuXxCM=" else { - x86_64-linux = "sha256-q3oTKcFSNec10kT1FlDaf2GS967y38VLq9GsquwN2Lg="; - aarch64-linux = "sha256-5mxVkppm1SjC0C0SFI7uEdPWewNZXlrNAxbaFcNzzbU="; + hash = if stdenv.isDarwin then "sha256-uxrLtq7rTmsgYHeE1yizHsnuijiL17RkbeBJPRUqRnw=" else { + x86_64-linux = "sha256-f38WtxmIbkZpi0P8Cn5jEU7aP2AzEvbnalBg9N/rbMY="; + aarch64-linux = "sha256-WTXF/l7Z33LKzjrTQ8YesgJUBVtKUTDkjfO8curuL2o="; }.${stdenv.hostPlatform.system}; }; 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/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 042666d2e1c7a..9ea7eed77a182 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.2"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-n1Ohja6Hpg/TNoxQKF1VCDkVj0UDCefr1x5ArIsgs2A="; + sha256 = "sha256-B4qP+qNNPMB/EkW/C2kfcx+h9YH8Md1lM9yUh5YT13s="; }; 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..eef3c083b5a10 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - sha256 = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; + hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; }; nativeBuildInputs = [ cmake ninja pkg-config qttools ]; 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/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 3aa2b6cf6deb8..a76654fdd9098 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "sfztools"; repo = pname; rev = version; - sha256 = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; + hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; fetchSubmodules = true; }; 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/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 67ec87343c74a..ad935b09ed16a 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "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 ]; @@ -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/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..fc0c5977360f8 100644 --- a/pkgs/applications/audio/sonobus/default.nix +++ b/pkgs/applications/audio/sonobus/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString (stdenv.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 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..cc7a5b3d7ce9f 100644 --- a/pkgs/applications/audio/soundsource/default.nix +++ b/pkgs/applications/audio/soundsource/default.nix @@ -29,7 +29,7 @@ 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 ]; platforms = platforms.darwin; }; }) 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..dcce24d173cec 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,16 +34,16 @@ 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 @@ -83,7 +84,8 @@ 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) '' @@ -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/darwin.nix b/pkgs/applications/audio/spotify/darwin.nix index e3066cc36dd1e..8304bdf3a15d9 100644 --- a/pkgs/applications/audio/spotify/darwin.nix +++ b/pkgs/applications/audio/spotify/darwin.nix @@ -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/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 43b4ae243540e..5ca8e481fa2d1 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -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.42.290.g242057a2"; # 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 = "78"; 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-3kT7SA2Q1OxgDa5duivIiHaxcROBAFjDnTx6rw2ya6o5yOVygseS02zBgWg2Qd8jq0721KbYC83u9M+MWtWhhA=="; }; 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. 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/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 0646099973ffa..f46ba519951b7 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.1"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-hzZx530HD7R3JOG6cCsoaW9puYkmu7m5lr+EfobKX7o="; + hash = "sha256-REoki+8rneQ+4rL9rC7Md5Hrj6ftd7RePEF1fK4FnKY="; fetchSubmodules = true; }; 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..662d7a49a8a2f 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.1"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-caki8WVnu8ELE2mXwRvT9TTTXCtMZEa0E3KVpHl05jg="; + hash = "sha256-FX0wb6GVTB/Y0m6qmoMbaeXPf8bA3+JqbGE8PPS6vAA="; }; 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..76ab54d970960 --- /dev/null +++ b/pkgs/applications/audio/tagger/deps.nix @@ -0,0 +1,53 @@ +# 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.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-wvudYblAZ5vOdQ/3Ssl24exAXRkhOG7KBZUjquLGo5o="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; hash = "sha256-aew8/vRyzCc7MMNHziR8tsg66EFkJC+Snst3F+a3Ehc="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; hash = "sha256-7kLTos2RiNJOmxg6NcM8QieifWMHgxHgd5e+DBNQI0Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; hash = "sha256-oAQI/uV0G/uEFp+2yAyhILZ6hr9t+oWh9TEY646Vphk="; }) + (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/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 990f0601c51dc..da77d6aeb5def 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -7,6 +7,7 @@ , flac , libjxl , librsvg +, game-music-emu , gobject-introspection , gtk3 , kissfft @@ -26,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.7.2"; + version = "7.8.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-IVl7XL6nn42zaY4bDraF9os0dXfquUql4E96djfVdVg="; + hash = "sha256-8UnUcEvG206tPwyD+WqxcJgDvQlYvTJ6v+sm0u30Z3k="; }; postUnpack = '' @@ -75,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ flac + game-music-emu gtk3 libappindicator libnotify diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index c5606677fd45c..160a032fd648b 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 @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib expat - ffmpeg_5 + ffmpeg file flac glib diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 1d9af5caf83f4..c76c6c6a4f869 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.14.1"; + version = "5.15.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-3oVQyFtAFqlh4GOgavN2e2TVhCILg6Rhf5GZcot+aKo="; + sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index b3cc4dbd22097..9e83c0472ff53 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.3.207"; + version = "1.3.4.209"; 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-dAyZ/x6ZUYst+3Hz8RL4+FW1oeb+652Zndpqp0JnGgs="; + armv7l-linux = "sha256-ub+qcWrpv+LiXbEq6YQczJN1E4c2i/ZtKbh5e2PMuH0="; + x86_64-linux = "sha256-c8hPbJo4MUqS0Ev5QzLujJJB3hqN3KMsLVdKb6MKNts="; }.${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; [ ]; + 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/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/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/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/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..e539e4c795062 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.12"; + version = "3.4.1"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-kBGMp58086NQ77x1YGS5NewWfiDaXHOEbyflHPtdfIs="; + hash = "sha256-HuV1jFSFvb/Ji150rVIvHrPLY3167W9/9xNnI81k9B8="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-t5omzz6y8lVFGAuhtc+HF5gwu4Ntt/dxml+nWysEpVs="; + hash = "sha256-uN4rB/S/uoqR+qj7T/TGtU+3PRGagYVfx51nn6U8sdo="; }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] 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..e99ef4225cc80 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="; }; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 20dcd0d491e8b..6f5512d4fa33b 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 @@ -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" @@ -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: 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 c96b99162292b..a295994808e5a 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -23,16 +23,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.24.1"; + version = "0.24.3"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-nRNXVJJcpZmAfZwDEBaEFlry1gbITWEw0khtsXnMdm0="; + hash = "sha256-FtLLj5uFcKuRTCSsSuyj0XGzFMVWQvVk4dTmBCmzfNs="; }; - cargoHash = "sha256-E5TaE4TlRA0wmRUiwFqivs18X6oiBCmeXrPI1GxKFBI="; + cargoHash = "sha256-xC6HiXt8cfrDtno9IrOe8SP7WBL79paLI223fjxPsbg="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index c34b1a19405b4..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; [ ]; + 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..fdac36e492f25 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -40,7 +40,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; [ 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 787f92246e7de..fde80422eea27 100644 --- a/pkgs/applications/blockchains/alfis/Cargo.lock +++ b/pkgs/applications/blockchains/alfis/Cargo.lock @@ -20,9 +20,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", @@ -45,9 +45,9 @@ dependencies = [ [[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", @@ -92,7 +92,7 @@ dependencies = [ "thread-priority", "time", "tinyfiledialogs", - "toml 0.8.8", + "toml 0.8.14", "ureq", "uuid", "web-view", @@ -104,9 +104,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" @@ -137,15 +137,15 @@ 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 = "base64" -version = "0.21.6" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -169,6 +169,12 @@ 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" @@ -206,9 +212,9 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[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" @@ -228,12 +234,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" [[package]] name = "cfg-if" @@ -267,9 +270,9 @@ 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", @@ -277,7 +280,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets", ] [[package]] @@ -320,9 +323,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", ] @@ -359,16 +362,15 @@ dependencies = [ [[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", "rustc_version", "subtle", "zeroize", @@ -382,14 +384,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.70", ] [[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", "zeroize", @@ -406,15 +408,15 @@ dependencies = [ [[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.70", ] [[package]] @@ -439,8 +441,8 @@ dependencies = [ [[package]] name = "ecies-ed25519-ng" -version = "0.5.2" -source = "git+https://github.com/Revertron/ecies-ed25519-ng?rev=577c4f2#577c4f2635fc5ccfce24428c6238b3fff5308438" +version = "0.5.3" +source = "git+https://github.com/Revertron/ecies-ed25519-ng?rev=554ca29#554ca29a1bbd55f0c7e2f75cb3c7e0e3030afc15" dependencies = [ "aes-gcm", "curve25519-dalek", @@ -465,9 +467,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", @@ -485,15 +487,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[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 = "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", @@ -559,9 +561,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", @@ -570,9 +572,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", @@ -632,15 +634,15 @@ dependencies = [ [[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" -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", @@ -657,9 +659,9 @@ dependencies = [ [[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" @@ -687,9 +689,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", @@ -720,9 +722,9 @@ 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", @@ -758,9 +760,9 @@ dependencies = [ [[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 = "javascriptcore-rs-sys" @@ -773,93 +775,98 @@ dependencies = [ [[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", ] [[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.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[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 = "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", ] [[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 = "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.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4929e1f84c5e54c3ec6141cd5d8b5a5c055f031f80cf78f2072920173cb4d880" dependencies = [ + "hermit-abi", "libc", "log", "wasi", - "windows-sys 0.48.0", + "windows-sys", ] [[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-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", ] @@ -876,9 +883,9 @@ 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", ] @@ -891,15 +898,15 @@ 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 = "5.0.1" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" dependencies = [ "is-wsl", "libc", @@ -942,15 +949,9 @@ dependencies = [ [[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 = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "poly1305" @@ -965,9 +966,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", @@ -989,18 +990,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[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", ] [[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", ] @@ -1037,16 +1038,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", "untrusted", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1060,11 +1062,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -1074,15 +1077,15 @@ dependencies = [ [[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" -version = "0.102.1" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -1091,36 +1094,36 @@ 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" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[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", ] [[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", ] @@ -1137,20 +1140,20 @@ 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.70", ] [[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", @@ -1159,9 +1162,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", ] @@ -1188,9 +1191,9 @@ dependencies = [ [[package]] name = "simplelog" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -1203,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", @@ -1236,19 +1239,18 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "sqlite" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03801c10193857d6a4a71ec46cee198a15cbc659622aabe1db0d0bdbefbcf8e6" +checksum = "274e5a9a0968bc9797fd3fe75a544cbcd3e3c2a111cb1c11cb8a0290f9684cb2" dependencies = [ - "libc", "sqlite3-sys", ] [[package]] name = "sqlite3-src" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454" +checksum = "174d4a6df77c27db281fb23de1a6d968f3aaaa4807c2a1afa8056b971f947b4a" dependencies = [ "cc", "pkg-config", @@ -1256,11 +1258,10 @@ dependencies = [ [[package]] name = "sqlite3-sys" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b" +checksum = "3901ada7090c3c3584dc92ec7ef1b7091868d13bfe6d7de9f0bcaffee7d0ade5" dependencies = [ - "libc", "sqlite3-src", ] @@ -1284,9 +1285,9 @@ 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 = "syn" @@ -1301,9 +1302,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -1327,40 +1328,40 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.70", ] [[package]] name = "thread-priority" -version = "0.15.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72cb4958060ee2d9540cef68bb3871fd1e547037772c7fe7650d5d1cbec53b3" +checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36" dependencies = [ - "bitflags", + "bitflags 2.6.0", "cfg-if", "libc", "log", @@ -1370,13 +1371,14 @@ 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-conv", "num_threads", "powerfmt", "serde", @@ -1392,10 +1394,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", ] @@ -1411,9 +1414,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", ] @@ -1435,9 +1438,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -1447,18 +1450,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.21.0" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", @@ -1475,9 +1478,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[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" @@ -1487,24 +1490,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 = "universal-hash" @@ -1524,8 +1527,8 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" -source = "git+https://github.com/algesten/ureq#4ddcc3a27a6c8cb88041dc713010455f776fa753" +version = "2.10.0" +source = "git+https://github.com/algesten/ureq#1cad58f5a4f359e318858810de51666d63de70e8" dependencies = [ "base64", "flate2", @@ -1533,16 +1536,15 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "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", @@ -1557,9 +1559,9 @@ checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" [[package]] name = "uuid" -version = "1.6.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -1585,9 +1587,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", @@ -1595,24 +1597,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.70", "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", @@ -1620,22 +1622,22 @@ 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.70", "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-view" @@ -1655,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", @@ -1672,9 +1674,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -1698,9 +1700,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" @@ -1720,11 +1722,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", ] [[package]] @@ -1739,214 +1741,98 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] name = "windows-service" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" dependencies = [ - "bitflags", + "bitflags 2.6.0", "widestring", - "windows-sys 0.45.0", + "windows-sys", ] [[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" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 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", + "windows-targets", ] [[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", + "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.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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +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" - -[[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" -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.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.42.2" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +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" - -[[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" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +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" - -[[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" -version = "0.42.2" +version = "0.52.6" 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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -1962,9 +1848,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", @@ -1974,29 +1860,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.70", ] [[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", ] @@ -2009,5 +1895,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.70", ] diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 690fdc7734d15..776aa155a2fef 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -15,20 +15,20 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.8.4-unstable-2024-03-08"; + version = "0.8.5"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; - rev = "28431ec0530405782038e7c02c2dedc3086bd7c9"; - hash = "sha256-HL4RRGXE8PIcD+zTF1xZSyOpKMhKF75Mxm6KLGsR4Hc="; + rev = "v${version}"; + hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ecies-ed25519-ng-0.5.2" = "sha256-E+jVbgKKK1DnJWAJN+xGZPCV2n7Gxp2t7XXkDNDnPN4="; - "ureq-2.9.1" = "sha256-ATT2wJ9kmY/Jjw6FEbxqM9pDytKFLmu/ZqH/pJpZTu8="; + "ecies-ed25519-ng-0.5.3" = "sha256-sJZ5JCaGNa3DdAaHw7/2qeLYv+HDKEMcY4uHbzfzQBM="; + "ureq-2.10.0" = "sha256-XNjY8qTgt2OzlfKu7ECIfgRLkSlprvjpgITsNVMi1uc="; "web-view-0.7.3" = "sha256-eVMcpMRZHwOdWhfV6Z1uGUNOmhB41YZPaiz1tRQvhrI="; }; }; diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 857467c967392..8ead5982b8555 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 diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 0306be5378292..c6838e0a0f65f 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,6 +32,14 @@ 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 ] 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..960ccf4183064 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,6 +44,14 @@ 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 ] diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix index da6e5b41aae15..fa94088bda8e4 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.2"; src = fetchFromGitHub { owner = "ZmnSCPxj"; repo = "clboss"; rev = "v${version}"; - hash = "sha256-DQvcf+y73QQYQanEvbOCOgwQzvNOXS1ZY+hVvS6N+G0="; + hash = "sha256-BMDeqAQGl2mSWyde5Pbai+1KHqPqcY+xzaY36L26olI="; }; 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..ac9595ce4123d 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 @@ -30,11 +31,11 @@ stdenv.mkDerivation rec { hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg="; }; - # 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.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; 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/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d77694b450f22..f89b340977942 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 }: diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 68dfa2be0579a..90bc9195f9b56 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,6 +34,14 @@ 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 ] diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index b3ff8ccce2c24..0ab89e9c27097 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.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 ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index d2b90cf5952fd..f91ffaeb05314 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.2"; + version = "2.60.5"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ="; + hash = "sha256-sI5XlPoHjAN3QsNWJXhi+qHDPVpcLqgX1hMa6gN5Iwc="; fetchSubmodules = true; }; - vendorHash = "sha256-r8Hh0UGdUbVOx9r10ymb9bJNZvxm/MzAVA9D0BaIzJg="; + vendorHash = "sha256-2Gx3ZUq1FDGEPW4qTwK916AGVMwoIDY97rkuEzRXP1U="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: 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..e3acd14a5a9ee 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,6 +42,14 @@ 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 ] diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index e4b108ecadcfd..32ec63a3f8cc0 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.0.2"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-jKeLFWJDwS8WWRynkDgBjvjq2EDpTEJadwkNsANQXws="; + hash = "sha256-XjRxpUW7NC12T5G7fol4avWLJDOOawxJbAHOp5eZ0Fk="; fetchSubmodules = true; }; - patches = [ - ./use-system-libraries.patch - ]; + inherit (monero-cli) patches; postPatch = '' # remove vendored libraries @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound 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 5f8b95411e99b..ce40616c5e40b 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.83.0"; + version = "2.84.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g="; + hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lighthouse/Cargo.lock b/pkgs/applications/blockchains/lighthouse/Cargo.lock index 6d76f7aef763f..1da30b0b94aca 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,107 @@ 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.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-eips", + "alloy-network", + "alloy-primitives", + "alloy-rlp", +] + +[[package]] +name = "alloy-eips" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", + "thiserror", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "alloy-network" +version = "0.1.0" +source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" +dependencies = [ + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-primitives" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "600d34d8de81e23b6d909c094e23b3d357e01ca36b78a8c5424c501eedbe86f0" +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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b155716bab55763c95ba212806cf43d05bcc70e5f35b02bad20cf5ec7fe11fed" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8037e03c7f462a063f28daec9fda285a9a89da003c552f8637a80b9c8fd96241" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] [[package]] name = "android-tzdata" @@ -200,19 +281,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.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +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,9 +352,148 @@ dependencies = [ [[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 = "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", + "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 = "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" @@ -243,9 +509,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 +525,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.66", "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.66", ] [[package]] @@ -299,9 +565,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock", "cfg-if", @@ -310,7 +576,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.30", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -329,13 +595,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -346,14 +612,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 +629,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 +647,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 +665,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.66", ] [[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 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.1.0", + "hyper 1.3.1", "hyper-util", "itoa", "matchit", @@ -440,7 +706,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -457,13 +723,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -471,9 +737,9 @@ dependencies = [ [[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", @@ -515,6 +781,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,7 +808,6 @@ dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", "execution_layer", - "exit-future", "fork_choice", "futures", "genesis", @@ -546,13 +817,14 @@ dependencies = [ "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 +855,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "4.6.0" +version = "5.2.0" dependencies = [ "beacon_chain", "clap", @@ -593,19 +865,15 @@ dependencies = [ "dirs", "environment", "eth2_config", - "eth2_network_config", "execution_layer", - "futures", "genesis", "hex", "http_api", - "hyper 1.1.0", + "hyper 1.3.1", "lighthouse_network", - "lighthouse_version", "monitoring_api", "node_test_rig", "sensitive_url", - "serde", "serde_json", "slasher", "slog", @@ -620,25 +888,22 @@ dependencies = [ name = "beacon_processor" version = "0.1.0" dependencies = [ - "derivative", - "ethereum_ssz", "fnv", "futures", - "hex", "itertools", "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", ] @@ -671,29 +936,21 @@ dependencies = [ ] [[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 +958,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -774,7 +1031,6 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "hex", - "milagro_bls", "rand", "serde", "tree_hash", @@ -805,7 +1061,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "4.6.0" +version = "5.2.0" dependencies = [ "beacon_node", "clap", @@ -817,12 +1073,9 @@ dependencies = [ "log", "logging", "serde", - "serde_json", - "serde_yaml", "slog", "slog-async", "slog-scope", - "slog-stdlog", "slog-term", "tokio", "types", @@ -836,9 +1089,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 +1105,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 +1127,9 @@ 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" dependencies = [ "serde", ] @@ -905,17 +1157,15 @@ 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", "hex", "libc", - "serde", ] [[package]] @@ -935,18 +1185,18 @@ dependencies = [ [[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 +1209,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -973,12 +1223,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[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]] @@ -997,6 +1248,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 +1279,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.5", +] + +[[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 +1338,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "f803f94ecf597339c7a34eed2036ef83f86aaba937f001f7c5b5e251f043f1f9" dependencies = [ "glob", "libc", @@ -1065,20 +1349,33 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "clap_builder", +] + +[[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", + "terminal_size", ] [[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] name = "clap_utils" version = "0.1.0" dependencies = [ @@ -1107,19 +1404,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,6 +1442,12 @@ 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 = [ @@ -1163,14 +1465,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 +1539,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", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -1259,9 +1574,9 @@ 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", @@ -1269,9 +1584,9 @@ 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", ] @@ -1297,9 +1612,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 +1678,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 +1706,27 @@ 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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.3.0", - "rustc_version", + "platforms 3.4.0", + "rustc_version 0.4.0", "subtle", "zeroize", ] @@ -1445,7 +1739,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1504,16 +1798,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 +1821,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 +1839,9 @@ dependencies = [ "clap_utils", "environment", "hex", - "logging", "slog", - "sloggers", "store", "strum", - "tempfile", "types", ] @@ -1561,7 +1858,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 +1887,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 +1898,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,7 +1938,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1653,17 +1950,17 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", ] [[package]] name = "diesel" -version = "2.1.4" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" +checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "byteorder", "diesel_derives", "itoa", @@ -1673,14 +1970,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1700,7 +1997,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1776,8 +2073,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", @@ -1812,7 +2110,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1845,7 +2143,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 +2163,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 +2182,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 +2202,6 @@ dependencies = [ "serde_yaml", "snap", "state_processing", - "store", "swap_or_not_shuffle", "tree_hash", "tree_hash_derive", @@ -1915,9 +2210,9 @@ dependencies = [ [[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 = "elliptic-curve" @@ -1960,9 +2255,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 +2287,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.66", ] [[package]] @@ -2025,10 +2320,10 @@ dependencies = [ name = "environment" version = "0.1.2" dependencies = [ + "async-channel", "ctrlc", "eth2_config", "eth2_network_config", - "exit-future", "futures", "logging", "serde", @@ -2059,9 +2354,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 +2383,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 +2430,6 @@ dependencies = [ "libsecp256k1", "lighthouse_network", "mediatype", - "mime", "pretty_reqwest_error", "procfs", "proto_array", @@ -2152,7 +2443,6 @@ dependencies = [ "ssz_types", "store", "tokio", - "tree_hash", "types", ] @@ -2224,7 +2514,6 @@ dependencies = [ "pretty_reqwest_error", "reqwest", "sensitive_url", - "serde_json", "serde_yaml", "sha2 0.9.9", "slog", @@ -2352,13 +2641,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", ] @@ -2502,7 +2791,7 @@ dependencies = [ "getrandom", "hashers", "hex", - "http 0.2.11", + "http 0.2.12", "once_cell", "parking_lot 0.11.2", "pin-project", @@ -2552,12 +2841,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 +2864,9 @@ dependencies = [ name = "execution_layer" version = "0.1.0" dependencies = [ + "alloy-consensus", + "alloy-rlp", "arc-swap", - "async-trait", "builder_client", "bytes", "environment", @@ -2586,9 +2875,7 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "ethers-core", - "exit-future", "fork_choice", - "futures", "hash-db", "hash256-std-hasher", "hex", @@ -2597,8 +2884,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 +2912,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 +2935,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 +2988,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 +2999,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 +3011,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 +3037,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", @@ -2837,7 +3131,8 @@ dependencies = [ [[package]] name = "futures-bounded" version = "0.2.3" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173" dependencies = [ "futures-timer", "futures-util", @@ -2879,9 +3174,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 +3190,18 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[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.8", + "rustls-pki-types", ] [[package]] @@ -2933,9 +3229,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 +3294,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 +3317,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 +3348,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -3062,6 +3358,36 @@ 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", + "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 +3411,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 +3461,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 +3484,7 @@ 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]] @@ -3185,7 +3496,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -3197,7 +3508,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 +3518,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,15 +3534,24 @@ 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" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hex_fmt" @@ -3235,9 +3561,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 +3576,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.5", + "socket2 0.5.7", "thiserror", "tinyvec", "tokio", @@ -3260,9 +3586,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 +3596,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "resolv-conf", "smallvec", @@ -3329,15 +3655,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 +3667,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 +3678,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,7 +3694,7 @@ 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", ] @@ -3388,18 +3705,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "futures-util", - "http 1.0.0", + "futures-core", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -3430,7 +3747,7 @@ dependencies = [ "lru", "network", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proto_array", "safe_arith", "sensitive_url", @@ -3500,14 +3817,14 @@ dependencies = [ "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 +3833,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -3540,9 +3857,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper 0.14.28", - "rustls 0.21.10", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -3562,27 +3879,24 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", - "futures-channel", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", - "hyper 1.1.0", + "hyper 1.3.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 +3943,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 +3952,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 +3961,7 @@ dependencies = [ "core-foundation", "fnv", "futures", - "if-addrs 0.10.2", + "if-addrs", "ipnet", "log", "rtnetlink", @@ -3678,29 +3971,16 @@ 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", + "http 0.2.12", "hyper 0.14.28", "log", "rand", @@ -3724,7 +4004,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 +4063,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 +4082,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 +4098,7 @@ version = "0.2.0" dependencies = [ "bytes", "hex", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -3836,7 +4116,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 +4127,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 +4140,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" @@ -3870,9 +4167,9 @@ dependencies = [ [[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 +4204,18 @@ dependencies = [ [[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 = "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 +4271,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" @@ -4016,7 +4323,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lcli" -version = "4.6.0" +version = "5.2.0" dependencies = [ "account_utils", "beacon_chain", @@ -4024,25 +4331,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 +4381,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.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -4130,14 +4436,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 +4456,6 @@ dependencies = [ "libp2p-connection-limits", "libp2p-core", "libp2p-dns", - "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", "libp2p-mdns", @@ -4170,7 +4476,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 +4488,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", @@ -4192,7 +4500,8 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.41.2" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05" dependencies = [ "either", "fnv", @@ -4204,7 +4513,7 @@ dependencies = [ "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", "rand", @@ -4219,56 +4528,26 @@ dependencies = [ [[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 +4557,7 @@ dependencies = [ "libp2p-swarm", "lru", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.3.1", "smallvec", "thiserror", "tracing", @@ -4292,7 +4571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "asn1_der", - "bs58 0.5.0", + "bs58 0.5.1", "ed25519-dalek", "hkdf", "libsecp256k1", @@ -4311,7 +4590,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 +4602,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tracing", "void", @@ -4331,12 +4611,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 +4627,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 +4672,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 +4698,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.8", + "socket2 0.5.7", "thiserror", "tokio", "tracing", @@ -4427,8 +4711,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 +4723,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", + "lru", "multistream-select", "once_cell", "rand", @@ -4449,19 +4735,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.66", ] [[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 +4757,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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2" dependencies = [ "futures", "futures-rustls", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.16.20", - "rustls 0.21.10", + "ring 0.17.8", + "rustls 0.23.8", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -4494,8 +4783,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 +4800,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 +4809,17 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.1", + "yamux 0.13.2", ] [[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.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -4586,15 +4876,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 +4894,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "4.6.0" +version = "5.2.0" dependencies = [ "account_manager", "account_utils", @@ -4634,10 +4925,8 @@ dependencies = [ "slasher", "slashing_protection", "slog", - "sloggers", "task_executor", "tempfile", - "tracing-subscriber", "types", "unused_port", "validator_client", @@ -4657,16 +4946,19 @@ 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", "lazy_static", "libp2p", @@ -4675,7 +4967,7 @@ dependencies = [ "lighthouse_version", "lru", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client", "quickcheck", "quickcheck_macros", @@ -4696,11 +4988,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 +5018,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 +5045,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 +5063,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 = "logging" @@ -4784,11 +5074,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 +5091,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 +5133,7 @@ dependencies = [ "lazy_static", "libc", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -4895,7 +5184,7 @@ name = "mdbx-sys" version = "0.11.6-4" source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" dependencies = [ - "bindgen 0.59.2", + "bindgen", "cc", "cmake", "libc", @@ -4903,21 +5192,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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[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", ] @@ -4979,15 +5268,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", + "parking_lot 0.12.3", + "rayon", + "serde", + "smallvec", + "tree_hash", + "triomphe", + "typenum", + "vec_map", ] [[package]] @@ -5014,18 +5314,18 @@ 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", ] [[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", "wasi", @@ -5034,9 +5334,9 @@ dependencies = [ [[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 +5406,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 +5489,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 +5504,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", + "igd-next", "itertools", "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 +5543,6 @@ dependencies = [ "task_executor", "tokio", "tokio-stream", - "tokio-util 0.6.10", "types", ] @@ -5263,12 +5559,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.5.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -5325,11 +5622,10 @@ dependencies = [ [[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", ] @@ -5353,20 +5649,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 +5676,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 +5690,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.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" 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,7 +5722,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" name = "oneshot_broadcast" version = "0.1.0" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -5440,9 +5733,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[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 +5764,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -5492,7 +5785,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -5503,18 +5796,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.3.0+3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -5536,7 +5829,7 @@ dependencies = [ "lazy_static", "lighthouse_metrics", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", "serde", @@ -5580,15 +5873,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 +5899,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 +5928,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 +5952,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.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -5683,9 +5976,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" @@ -5725,11 +6018,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 +6042,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pest" +version = "2.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +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 +6082,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.66", ] [[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 +6128,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" @@ -5842,15 +6146,15 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "platforms" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[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 +6165,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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -5913,9 +6218,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", @@ -5982,16 +6287,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 +6334,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.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -6096,28 +6367,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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510c4f1c9d81d556458f94c98f857748130ea9737bbd6053da497503b26ea63c" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -6129,7 +6400,27 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", +] + +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.5.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.3", + "rusty-fork", + "tempfile", + "unarray", ] [[package]] @@ -6187,10 +6478,24 @@ dependencies = [ [[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 +6526,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" dependencies = [ "bytes", "futures-io", @@ -6231,7 +6536,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.8", "thiserror", "tokio", "tracing", @@ -6239,15 +6544,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" dependencies = [ "bytes", "rand", - "ring 0.16.20", + "ring 0.17.8", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.8", "slab", "thiserror", "tinyvec", @@ -6256,22 +6561,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" dependencies = [ - "bytes", "libc", - "socket2 0.5.5", + "once_cell", + "socket2 0.5.7", "tracing", - "windows-sys 0.48.0", + "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 +6588,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 +6655,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,7 +6679,7 @@ 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", @@ -6399,10 +6704,19 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -6411,14 +6725,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -6432,13 +6746,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -6449,23 +6763,23 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[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 = "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-rustls", @@ -6478,16 +6792,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 +6861,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 +6912,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 +6936,36 @@ dependencies = [ ] [[package]] +name = "ruint" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" +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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" + +[[package]] name = "rusqlite" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6626,9 +6981,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" @@ -6644,11 +6999,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 +7040,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.5.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.4", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -6724,19 +7102,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 +7122,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.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" 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 = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 +7168,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 +7196,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 +7233,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 +7266,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 +7291,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 +7300,11 @@ 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.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -6922,9 +7313,9 @@ dependencies = [ [[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", @@ -6932,14 +7323,32 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +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.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +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 +7364,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -6973,31 +7382,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.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -7006,9 +7405,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 +7415,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.66", ] [[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", ] @@ -7070,11 +7469,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 +7538,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 +7564,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 +7609,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", ] @@ -7245,13 +7654,12 @@ dependencies = [ "logging", "lru", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", "safe_arith", "serde", "slog", - "sloggers", "strum", "tempfile", "tree_hash", @@ -7361,11 +7769,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 +7782,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 +7810,15 @@ 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" [[package]] name = "snap" @@ -7420,17 +7828,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 +7855,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,14 +7892,14 @@ 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", @@ -7506,6 +7914,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 = [ @@ -7564,7 +7978,7 @@ dependencies = [ "leveldb", "lighthouse_metrics", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "slog", "sloggers", @@ -7576,26 +7990,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 +8026,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", @@ -7627,9 +8041,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "superstruct" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b9e5728aa1a87141cefd4e7509903fc01fa0dcb108022b1e841a67c5159fc5" +checksum = "6f4e1f478a7728f8855d7e620e9a152cf8932c6614f86564c886f9b8141f3201" dependencies = [ "darling", "itertools", @@ -7661,9 +8075,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", @@ -7677,15 +8091,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.66", ] [[package]] @@ -7729,9 +8148,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 +8183,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 +8195,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 +8226,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 +8269,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.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[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 +8309,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 +8330,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", ] @@ -7985,9 +8404,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -7996,7 +8415,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -8019,7 +8438,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -8045,16 +8464,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 +8483,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 +8493,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" @@ -8145,9 +8548,9 @@ 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", ] @@ -8158,7 +8561,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -8167,11 +8570,11 @@ dependencies = [ [[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", ] @@ -8236,7 +8639,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -8309,9 +8712,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,9 +8723,9 @@ 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", "quote", @@ -8340,6 +8743,16 @@ dependencies = [ ] [[package]] +name = "triomphe" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8378,12 +8791,14 @@ dependencies = [ "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 +8808,6 @@ dependencies = [ "smallvec", "ssz_types", "state_processing", - "strum", "superstruct", "swap_or_not_shuffle", "tempfile", @@ -8404,6 +8818,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 +8837,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 +8871,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 +8912,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,7 +8954,7 @@ version = "0.1.0" dependencies = [ "lazy_static", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -8549,6 +8969,12 @@ dependencies = [ ] [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8574,11 +9000,11 @@ dependencies = [ "eth2", "eth2_keystore", "ethereum_serde_utils", - "exit-future", + "fdlimit", "filesystem", "futures", "hex", - "hyper 1.1.0", + "hyper 1.3.1", "itertools", "lazy_static", "libsecp256k1", @@ -8588,7 +9014,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 +9063,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 +9112,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 +9141,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", + "http 0.2.12", "hyper 0.14.28", "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 +9173,7 @@ name = "warp_utils" version = "0.1.0" dependencies = [ "beacon_chain", + "bytes", "eth2", "headers", "lazy_static", @@ -8746,6 +9181,7 @@ dependencies = [ "safe_arith", "serde", "serde_array_query", + "serde_json", "state_processing", "tokio", "types", @@ -8759,10 +9195,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 +9212,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.66", "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 +9239,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 +9249,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.66", "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 +9302,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.3.1", "log", "logging", "network", @@ -8889,9 +9330,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 +9353,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 +9376,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "which" -version = "4.4.2" +version = "0.25.4" 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 +9399,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 +9421,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 +9471,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.5", ] [[package]] @@ -9064,7 +9498,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]] @@ -9099,17 +9533,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]] @@ -9126,9 +9561,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" @@ -9144,9 +9579,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" @@ -9162,9 +9597,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" @@ -9180,9 +9621,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" @@ -9198,9 +9639,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" @@ -9216,9 +9657,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" @@ -9234,15 +9675,15 @@ 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.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -9268,7 +9709,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version", + "rustc_version 0.4.0", "send_wrapper", "thiserror", "wasm-bindgen", @@ -9293,9 +9734,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 +9746,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 +9763,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 +9777,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "498f4d102a79ea1c9d4dd27573c0fc96ad74c023e8da38484e47883076da25fb" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] @@ -9353,7 +9796,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", @@ -9361,15 +9804,15 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002" +checksum = "5f97202f6b125031b95d83e01dc57292b529384f80bfae4677e4bbc10178cf72" dependencies = [ "futures", "instant", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", @@ -9386,29 +9829,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[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 +9864,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -9430,7 +9873,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 +9908,9 @@ dependencies = [ [[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/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index b348233d312d7..2fbccd581edaa 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 @@ -18,12 +17,11 @@ , stdenv , SystemConfiguration , testers -, unzip }: rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "4.6.0"; + version = "5.2.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-kruHYFPQ9H9HtEjzscQOyghPSpx++wNbHDYOVo0qtjY="; }; 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="; + "alloy-consensus-0.1.0" = "sha256-y5AIZN4d7Vm2dVa3jd0e6zXwC8hzPyOv0h5+W/Az3rs="; "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q="; "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk="; - "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE="; }; }; 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..8a3c6a2657aae 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,6 +34,13 @@ 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 ]; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index a4271b9367951..87bc32bd1af5a 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,22 +1,21 @@ { buildGoModule , fetchFromGitHub , lib -, go , tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] }: buildGoModule rec { pname = "lnd"; - version = "0.18.0-beta"; + version = "0.18.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-LkVlsmL/NjWtKUnerqTiT/jNfxazYw0B0GhBDCTGmao="; + hash = "sha256-qqvLnJlFGeCizm6T9iUwvYLjWpAeZwbuzQlUUopwrjc="; }; - vendorHash = "sha256-T7jPuhAEeQ0U43J9gTQ+0/BdLAn4BOupAkmmmofhHtY="; + vendorHash = "sha256-BxNtZzwmKJ/kZk7ndtEUC4bMGpd8LEhFFu4Z49bKydE="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; 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..8a842d507b0cb 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -18,12 +18,8 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.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..50d5d1b109a3e 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch2, cmake, ninja, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson @@ -35,6 +35,28 @@ stdenv.mkDerivation rec { }; patches = [ + # cmake: remove unused/extera cmake/FindMiniupnpc.cmake and only rely on external/miniupnpc + # https://github.com/monero-project/monero/pull/9366 + (fetchpatch2 { + url = "https://github.com/monero-project/monero/commit/5074a543a49f7e23fb39b6462fd4c4c9741c3693.patch?full_index=1"; + hash = "sha256-dS2hhEU6m2of0ULlsf+/tZMHUmq3vGGXJPGHvtnpQnY="; + }) + + # cmake: add different parameters to add_monero_library. + # https://github.com/monero-project/monero/pull/9367 + (fetchpatch2 { + url = "https://github.com/monero-project/monero/commit/b91ead90254ac6d6daf908f689c38e372a44c615.patch?full_index=1"; + hash = "sha256-DL2YqkvEONbeEDqLOAo2eSF5JF5gOzKcLKeNlUXBY1w="; + }) + + # external: update miniupnpc to 2.2.8 + # https://github.com/monero-project/monero/pull/9367 + (fetchpatch2 { + url = "https://github.com/monero-project/monero/commit/d81da086ec5088a04b3f7b34831e72910300e2f7.patch?full_index=1"; + hash = "sha256-ZJGiDMk5DMmEXwzoUYPC+DIoebluFh54kMQtQU78ckI="; + excludes = [ "external/miniupnp" ]; + }) + ./use-system-libraries.patch ]; @@ -47,7 +69,7 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound diff --git a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch index 5d3e3561d5548..f8629d47553c6 100644 --- a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch +++ b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch @@ -1,14 +1,14 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 5b7f69a56..5536debe8 100644 +index f8b834ac17...520e148428 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -36,22 +36,9 @@ - # others. +@@ -39,23 +39,12 @@ + add_compile_options(-D_GNU_SOURCE) + endif() - find_package(Miniupnpc REQUIRED) -- -message(STATUS "Using in-tree miniupnpc") -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) +-set(UPNPC_BUILD_TESTS FALSE CACHE BOOL "Disable miniupnp internal tests." FORCE) -add_subdirectory(miniupnp/miniupnpc) -set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") -set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -20,33 +20,19 @@ index 5b7f69a56..5536debe8 100644 -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) ++include(FindPkgConfig) ++pkg_check_modules(MINIUPNPC REQUIRED IMPORTED_TARGET GLOBAL miniupnpc) ++get_target_property(MINIUPNPC_INCLUDE_DIR PkgConfig::MINIUPNPC INTERFACE_INCLUDE_DIRECTORIES) ++set_target_properties(PkgConfig::MINIUPNPC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}/miniupnpc") ++set(UPNP_LIBRARIES PkgConfig::MINIUPNPC PARENT_SCOPE) +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) +- find_package(Unbound) -@@ -69,4 +56,3 @@ endif() + if(NOT UNBOUND_INCLUDE_DIR) +@@ -72,4 +61,3 @@ 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 ---- a/src/p2p/net_node.inl -+++ b/src/p2p/net_node.inl -@@ -61,9 +61,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/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/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..14c763e27c23b 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.0"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc="; + hash = "sha256-TIxA+Dyxdwm3Q8U6xh7x7hBPNXmH+vVDK2lAaRFKSN0="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ="; + vendorHash = "sha256-xoflPeUeFlbMBUSas+dmBOCFOOvrBHEvYWEk7QkNW14="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index dcd9f107b9267..cacb8f5f46198 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 ]; 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..c00775bafdf0d 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.0" 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.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-proof-size-hostfunction", @@ -4145,25 +4137,23 @@ 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.0" 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 +4164,6 @@ dependencies = [ "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4182,7 +4171,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 +4199,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4222,12 +4211,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 +4225,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 +4251,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 +4263,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand 0.8.5", + "rand", "sc-client-api", "sc-rpc-api", "sc-service", @@ -4295,7 +4278,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-version", "thiserror", "tokio", @@ -4343,14 +4326,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 +4371,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -4436,8 +4417,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 +4442,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 +4468,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.5.6", + "socket2 0.5.7", "windows-sys 0.52.0", ] @@ -4511,29 +4490,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 +4523,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.4", + "rand_core", "subtle-ng", "zeroize", ] @@ -4671,7 +4636,21 @@ 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", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.1", "displaydoc", "nom", "num-bigint", @@ -4698,17 +4677,6 @@ dependencies = [ [[package]] name = "derive-syn-parse" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "derive-syn-parse" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" @@ -4844,22 +4812,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 +4842,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 +4915,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 +4935,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 +4950,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 +4978,7 @@ dependencies = [ "generic-array 0.14.7", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "serdect", "subtle 2.5.0", @@ -5058,7 +4987,7 @@ dependencies = [ [[package]] name = "emulated-integration-tests-common" -version = "3.0.0" +version = "13.0.0" dependencies = [ "asset-test-utils", "bp-messages", @@ -5180,19 +5109,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 +5248,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 +5279,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 +5396,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 +5450,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 +5466,7 @@ dependencies = [ "futures", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "relay-utils", ] @@ -5553,7 +5489,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 +5507,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "libz-sys", "miniz_oxide", ] @@ -5607,16 +5542,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 +5584,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "frame-support", @@ -5668,15 +5603,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 +5627,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-chain-spec", @@ -5709,23 +5643,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 +5668,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 +5688,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 +5713,7 @@ dependencies = [ "frame-support", "honggfuzz", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -5790,7 +5722,7 @@ dependencies = [ [[package]] name = "frame-executive" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -5806,8 +5738,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", ] @@ -5825,7 +5756,7 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.1.0" +version = "0.5.0" dependencies = [ "array-bytes", "docify", @@ -5838,7 +5769,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 +5777,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 +5791,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.35.0" +version = "0.45.0" dependencies = [ "futures", "indicatif", @@ -5873,7 +5804,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "spinners", "substrate-rpc-client", "tokio", @@ -5882,7 +5813,7 @@ dependencies = [ [[package]] name = "frame-support" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -5909,7 +5840,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 +5848,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 +5858,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 +5877,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 +5888,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 +5917,6 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-version", "static_assertions", "trybuild", @@ -5994,7 +5924,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 +5937,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-support", "frame-system", @@ -6028,7 +5958,7 @@ dependencies = [ [[package]] name = "frame-system" -version = "28.0.0" +version = "37.0.0" dependencies = [ "cfg-if", "criterion", @@ -6039,10 +5969,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 +5980,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -6058,30 +5988,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 +6067,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 +6121,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 +6148,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 +6187,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite", "pin-utils", "slab", ] @@ -6255,7 +6203,7 @@ dependencies = [ [[package]] name = "generate-bags" -version = "28.0.0" +version = "37.0.0" dependencies = [ "chrono", "frame-election-provider-support", @@ -6298,24 +6246,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 +6261,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 +6316,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 +6348,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 +6371,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 +6384,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 +6399,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 +6476,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 +6485,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 +6627,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 +6691,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 +6714,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 +6833,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 +6868,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 +7060,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 +7104,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 +7144,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 +7200,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 +7216,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 +7239,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 +7267,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 +7292,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 +7305,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 +7333,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 +7346,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 +7399,7 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" [[package]] name = "kitchensink-runtime" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "log", "node-primitives", @@ -7334,7 +7439,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 +7450,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" dependencies = [ "kvdb", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "rocksdb", "smallvec", @@ -7438,9 +7543,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 +7559,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 +7584,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 +7608,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 +7620,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 +7631,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 +7687,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 +7722,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 +7745,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 +7755,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 +7827,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 +7849,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 +7870,9 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand 0.8.5", + "multistream-select", + "once_cell", + "rand", "smallvec", "tokio", "void", @@ -7755,36 +7880,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 +7920,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 +8019,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -8003,40 +8149,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 +8191,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 +8233,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 +8295,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 +8307,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 +8321,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 +8332,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 +8355,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" @@ -8323,7 +8460,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] @@ -8334,13 +8471,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 +8488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand 0.8.5", + "rand", "thrift", ] @@ -8370,7 +8506,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minimal-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "docify", "minimal-template-node", @@ -8383,9 +8519,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 +8555,7 @@ dependencies = [ [[package]] name = "minimal-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "pallet-balances", "pallet-minimal-template", @@ -8450,7 +8587,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 +8602,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 +8618,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 +8634,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 +8709,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 +8729,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 +8774,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 +8791,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 +8804,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 +8818,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 +8829,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 +8875,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 +8991,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 +9011,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 +9027,7 @@ dependencies = [ "node-primitives", "node-testing", "parity-db", - "rand 0.8.5", + "rand", "sc-basic-authorship", "sc-client-api", "sc-transaction-pool", @@ -8923,7 +9040,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "tempfile", ] @@ -8938,7 +9055,7 @@ dependencies = [ [[package]] name = "node-rpc" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -8997,7 +9114,7 @@ dependencies = [ [[package]] name = "node-testing" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "frame-metadata-hash-extension", "frame-system", @@ -9128,6 +9245,17 @@ dependencies = [ ] [[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 +9360,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 +9402,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 +9458,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 +9475,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 +9518,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pallet-alliance" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -9397,12 +9534,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 +9554,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 +9574,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 +9591,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 +9607,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 +9627,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 +9677,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 +9694,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 +9710,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 +9724,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 +9751,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 +9770,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 +9796,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 +9817,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 +9844,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 +9868,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 +9885,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -9762,24 +9901,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 +9928,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 +9943,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 +9973,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 +9994,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 +10014,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 +10033,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 +10049,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 +10072,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 +10086,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 +10115,7 @@ dependencies = [ "parity-scale-codec", "paste", "pretty_assertions", - "rand 0.8.5", + "rand", "rand_pcg", "scale-info", "serde", @@ -9991,12 +10125,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 +10150,7 @@ dependencies = [ [[package]] name = "pallet-contracts-mock-network" -version = "3.0.0" +version = "13.0.0" dependencies = [ "assert_matches", "frame-support", @@ -10044,8 +10178,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 +10187,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 +10196,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 +10207,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" -version = "28.0.0" +version = "37.0.0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -10088,12 +10221,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 +10238,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10120,12 +10251,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 +10271,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 +10292,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 +10307,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10198,20 +10325,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 +10348,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 +10370,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 +10388,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 +10406,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 +10419,7 @@ dependencies = [ [[package]] name = "pallet-example-kitchensink" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10308,7 +10431,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10339,12 +10461,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 +10479,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-version", ] @@ -10374,7 +10494,6 @@ dependencies = [ "scale-info", "sp-core", "sp-io", - "sp-std 14.0.0", ] [[package]] @@ -10390,12 +10509,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 +10528,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -10428,14 +10546,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 +10563,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 +10595,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 +10613,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 +10632,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 +10648,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 +10662,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 +10678,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 +10693,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 +10705,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_distr", "scale-info", "serde", @@ -10604,14 +10714,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 +10737,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 +10752,7 @@ dependencies = [ [[package]] name = "pallet-mixnet" -version = "0.4.0" +version = "0.13.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10658,12 +10766,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 +10785,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 +10800,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 +10818,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 +10837,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 +10862,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 +10876,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 +10892,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 +10915,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 +10928,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 +10964,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 +10988,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 +11007,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 +11033,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 +11049,6 @@ dependencies = [ "sp-io", "sp-metadata-ir", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10969,7 +11064,7 @@ dependencies = [ [[package]] name = "pallet-parachain-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10983,7 +11078,7 @@ dependencies = [ [[package]] name = "pallet-parameters" -version = "0.1.0" +version = "0.8.0" dependencies = [ "docify", "frame-benchmarking", @@ -10998,12 +11093,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 +11109,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 +11125,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 +11142,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 +11157,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 +11178,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 +11193,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 +11213,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 +11227,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 +11246,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 +11263,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 +11280,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 +11296,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 +11315,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 +11332,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 +11362,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 +11387,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 +11396,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 +11413,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "19.0.0" +version = "22.0.0" dependencies = [ "log", "sp-arithmetic", @@ -11362,7 +11421,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" -version = "14.0.0" +version = "22.0.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -11371,7 +11430,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-benchmarking", "frame-remote-externalities", @@ -11380,14 +11439,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 +11454,7 @@ dependencies = [ [[package]] name = "pallet-statement" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -11409,12 +11467,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 +11482,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 +11500,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11457,14 +11513,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 +11533,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 +11550,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 +11569,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 +11580,7 @@ dependencies = [ [[package]] name = "pallet-transaction-storage" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -11542,13 +11595,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 +11615,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 +11633,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 +11649,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 +11668,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 +11684,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 +11701,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 +11722,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 +11745,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 +11753,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub" -version = "0.2.0" +version = "0.12.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -11725,7 +11770,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 +11778,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 +11790,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 +11856,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 +11905,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -11872,7 +11916,7 @@ dependencies = [ [[package]] name = "parachains-common" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", @@ -11893,7 +11937,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -11917,7 +11960,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 +11981,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 +11995,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 +12021,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 +12055,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 +12066,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 +12080,7 @@ checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.82", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -12072,9 +12108,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 +12156,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 +12193,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 +12206,7 @@ dependencies = [ [[package]] name = "penpal-runtime" -version = "0.14.0" +version = "0.24.0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -12218,8 +12254,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 +12262,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12255,9 +12290,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 +12300,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 +12351,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 +12360,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12356,19 +12388,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 +12448,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 +12458,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 +12543,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 +12605,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "6.0.0" +version = "16.0.0" dependencies = [ "assert_cmd", "color-eyre", @@ -12603,7 +12626,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12621,9 +12644,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 +12655,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "assert_matches", @@ -12647,8 +12670,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 +12682,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "derive_more", @@ -12676,21 +12699,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 +12731,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 +12756,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cfg-if", "clap 4.5.3", @@ -12762,7 +12785,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12793,18 +12816,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.0" dependencies = [ "assert_matches", "async-channel", @@ -12830,14 +12852,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 +12874,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 +12899,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 +12915,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 +12934,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -12934,7 +12956,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -12949,7 +12971,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 +12981,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 +13001,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12990,7 +13012,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 +13031,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13030,14 +13052,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 +13075,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13078,7 +13100,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "maplit", @@ -13098,7 +13120,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -13106,7 +13128,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 +13141,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "fatality", @@ -13140,14 +13162,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,7 +13185,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" -version = "6.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13177,6 +13199,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", "sc-keystore", "sp-application-crypto", "sp-core", @@ -13188,7 +13211,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "7.0.0" +version = "17.0.0" dependencies = [ "bitvec", "fatality", @@ -13210,7 +13233,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "array-bytes", @@ -13236,7 +13259,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "procfs", - "rand 0.8.5", + "rand", "rococo-runtime", "rusty-fork", "sc-sysinfo", @@ -13253,7 +13276,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "futures-timer", @@ -13276,7 +13299,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" -version = "7.0.0" +version = "15.0.0" dependencies = [ "assert_matches", "cpu-time", @@ -13293,9 +13316,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 +13326,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 +13341,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-prepare-worker" -version = "7.0.0" +version = "15.0.0" dependencies = [ "blake3", "cfg-if", @@ -13341,7 +13364,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "futures", @@ -13362,13 +13385,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 +13403,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 +13431,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-channel", "async-trait", @@ -13419,8 +13444,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 +13457,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "bitvec", "bounded-vec", @@ -13455,7 +13480,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 +13493,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 +13510,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "bitvec", @@ -13514,7 +13539,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13531,7 +13556,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 +13570,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 +13583,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13566,7 +13591,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 +13609,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.13.0" +version = "5.0.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13609,6 +13634,7 @@ dependencies = [ "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "docify", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -13663,9 +13689,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 +13707,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" -version = "6.0.0" +version = "14.0.0" dependencies = [ "bounded-collections", "derive_more", @@ -13691,13 +13717,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 +13743,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 +13759,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "7.0.0" +version = "17.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -13769,7 +13793,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -13816,7 +13840,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -13825,19 +13848,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.0" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -13867,10 +13889,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 +13908,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 +13917,7 @@ dependencies = [ [[package]] name = "polkadot-sdk" -version = "0.1.0" +version = "0.5.0" dependencies = [ "asset-test-utils", "assets-common", @@ -13985,6 +14005,7 @@ dependencies = [ "pallet-asset-rate", "pallet-asset-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", @@ -14218,12 +14239,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 +14259,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 +14297,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 +14318,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 +14339,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 +14364,7 @@ dependencies = [ "sc-service", "scale-info", "simple-mermaid 0.1.1", + "solochain-template-runtime", "sp-api", "sp-arithmetic", "sp-core", @@ -14346,6 +14373,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 +14388,7 @@ dependencies = [ [[package]] name = "polkadot-sdk-frame" -version = "0.1.0" +version = "0.6.0" dependencies = [ "docify", "frame-benchmarking", @@ -14383,15 +14413,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.0" dependencies = [ "assert_matches", "async-trait", @@ -14416,7 +14445,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 +14531,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 +14543,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 +14567,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 +14576,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 +14635,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 +14656,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "strum 0.24.1", + "strum 0.26.2", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14687,7 +14716,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 +14772,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -14775,7 +14803,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 +14837,7 @@ dependencies = [ [[package]] name = "polkadot-voter-bags" -version = "7.0.0" +version = "17.0.0" dependencies = [ "clap 4.5.3", "generate-bags", @@ -14912,11 +14940,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,7 +14993,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -14967,7 +15009,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 +15176,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 +15220,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 +15235,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 +15250,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 +15297,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 +15321,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 +15365,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 +15387,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 +15413,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 +15466,7 @@ dependencies = [ "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -15435,15 +15488,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 +15518,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 +15576,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 +15644,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 +15660,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 +15669,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 +15679,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 +15688,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 +15697,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 +15800,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 +15930,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 +15974,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 +15993,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 +16010,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 +16060,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 +16080,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 +16088,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 +16115,7 @@ dependencies = [ [[package]] name = "rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "emulated-integration-tests-common", "parachains-common", @@ -16097,7 +16131,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 +16170,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -16149,7 +16182,7 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "7.0.0" +version = "17.0.0" dependencies = [ "binary-merkle-tree", "bitvec", @@ -16238,9 +16271,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 +16283,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 +16303,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 +16315,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 +16414,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand", "rlp", "ruint-macro", "serde", @@ -16484,7 +16516,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 +16525,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 +16536,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 +16548,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 +16607,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 = "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 = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -16591,9 +16650,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 +16690,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 +16734,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 +16753,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 +16768,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 +16776,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 +16801,7 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.33.0" +version = "0.42.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -16759,7 +16817,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "clap 4.5.3", @@ -16785,13 +16843,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 +16859,7 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.36.0" +version = "0.46.0" dependencies = [ "array-bytes", "chrono", @@ -16815,7 +16873,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", @@ -16835,7 +16893,7 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "tempfile", "thiserror", @@ -16844,13 +16902,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 +16917,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 +16931,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.35.0" +version = "0.44.0" dependencies = [ "array-bytes", "criterion", @@ -16886,9 +16944,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 +16956,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 +16964,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 +16988,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 +17016,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 +17026,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "fork-tree", @@ -16979,7 +17036,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 +17059,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 +17068,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "futures", "jsonrpsee", @@ -17039,7 +17096,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" -version = "13.0.0" +version = "23.0.0" dependencies = [ "array-bytes", "async-channel", @@ -17048,7 +17105,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 +17129,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 +17140,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 +17162,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.33.0" +version = "0.43.0" dependencies = [ "fork-tree", "parity-scale-codec", @@ -17117,9 +17174,9 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.19.0" +version = "0.29.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "array-bytes", "assert_matches", "async-trait", @@ -17130,8 +17187,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 +17215,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 +17224,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.19.0" +version = "0.29.0" dependencies = [ "finality-grandpa", "futures", @@ -17191,7 +17248,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.35.0" +version = "0.45.0" dependencies = [ "assert_matches", "async-trait", @@ -17229,14 +17286,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 +17310,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", @@ -17276,7 +17333,7 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.32.0" +version = "0.40.0" dependencies = [ "array-bytes", "assert_matches", @@ -17284,7 +17341,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 +17353,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 +17403,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 +17419,7 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.33.0" +version = "0.43.0" dependencies = [ "ansi_term", "futures", @@ -17378,10 +17435,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 +17449,7 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.4.0" +version = "0.14.0" dependencies = [ "array-bytes", "arrayvec 0.7.4", @@ -17402,9 +17459,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 +17477,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -17442,12 +17499,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 +17523,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 +17533,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", "wasm-timer", "zeroize", @@ -17484,7 +17541,7 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -17502,13 +17559,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 +17582,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 +17602,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 +17621,7 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "async-channel", @@ -17578,7 +17633,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 +17652,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 +17669,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 +17685,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 +17693,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 +17711,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 +17736,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 +17757,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 +17770,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.17.0" +version = "0.18.0" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -17724,7 +17778,7 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "29.0.0" +version = "39.0.0" dependencies = [ "assert_matches", "env_logger 0.11.3", @@ -17732,7 +17786,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 +17815,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 +17839,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 +17860,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -17814,9 +17870,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 +17888,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 +17908,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 +17924,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 +17956,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 +17987,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 +18004,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 +18015,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 +18045,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" -version = "0.16.0" +version = "0.22.0" dependencies = [ "clap 4.5.3", "fs4", @@ -18002,7 +18057,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -18020,13 +18075,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 +18091,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 +18115,7 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "28.0.0" +version = "37.0.0" dependencies = [ "ansi_term", "chrono", @@ -18070,7 +18125,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 +18136,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 +18155,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "assert_matches", @@ -18111,7 +18166,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 +18178,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 +18189,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "async-trait", "futures", @@ -18150,14 +18205,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 +18230,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 +18312,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 +18327,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 +18342,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 +18390,7 @@ dependencies = [ "crc", "fxhash", "log", - "rand 0.8.5", + "rand", "slab", "thiserror", ] @@ -18366,18 +18421,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 +18448,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 +18472,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 +18498,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -18501,6 +18556,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" @@ -18630,7 +18691,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serial_test_derive", ] @@ -18735,7 +18796,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 +18821,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -18797,18 +18857,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 +18884,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 +18921,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 +18964,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 +18988,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 +18999,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 +19017,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 +19028,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 +19042,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 +19058,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 +19086,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 +19106,7 @@ dependencies = [ [[package]] name = "snowbridge-beacon-primitives" -version = "0.2.0" +version = "0.9.0" dependencies = [ "byte-slice-cast", "frame-support", @@ -19068,14 +19121,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 +19144,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 +19159,7 @@ dependencies = [ "hex-literal", "parity-bytes", "parity-scale-codec", - "rand 0.8.5", + "rand", "rlp", "scale-info", "serde", @@ -19114,7 +19167,7 @@ dependencies = [ "serde_json", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "wasm-bindgen-test", ] @@ -19127,7 +19180,7 @@ dependencies = [ "hex", "lazy_static", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "snowbridge-amcl", "zeroize", @@ -19135,7 +19188,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 +19203,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 +19224,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -19183,24 +19236,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 +19275,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 +19311,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 +19335,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 +19375,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 +19405,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 +19426,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 +19442,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 +19509,7 @@ dependencies = [ [[package]] name = "solochain-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-executive", @@ -19472,8 +19538,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 +19546,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 +19568,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "15.0.0" +version = "20.0.0" dependencies = [ "Inflector", "assert_matches", @@ -19531,7 +19596,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 +19605,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 +19627,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "23.0.0" +version = "26.0.0" dependencies = [ "criterion", "docify", @@ -19571,11 +19635,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 +19654,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 +19666,7 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-inherents", @@ -19630,24 +19675,25 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "28.0.0" +version = "37.0.0" 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 +19708,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -19677,7 +19723,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -19694,7 +19740,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" -version = "13.0.0" +version = "22.0.0" dependencies = [ "array-bytes", "lazy_static", @@ -19715,7 +19761,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "13.0.0" +version = "21.0.0" dependencies = [ "finality-grandpa", "log", @@ -19731,7 +19777,7 @@ dependencies = [ [[package]] name = "sp-consensus-pow" -version = "0.32.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -19740,22 +19786,8 @@ dependencies = [ ] [[package]] -name = "sp-consensus-sassafras" -version = "0.3.4-dev" -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 +19797,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 +19819,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 +19831,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 +19846,7 @@ dependencies = [ [[package]] name = "sp-core-fuzz" -version = "0.0.0" +version = "0.1.0" dependencies = [ "lazy_static", "libfuzzer-sys", @@ -19825,42 +19856,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 +19883,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 +19915,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 +19929,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 +19949,7 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "futures", @@ -19973,10 +19962,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 +19975,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 +19987,7 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "31.0.0" +version = "39.0.0" dependencies = [ "sp-core", "sp-runtime", @@ -20007,14 +19996,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 +20016,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.6.0" +version = "0.7.0" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -20036,7 +20025,7 @@ dependencies = [ [[package]] name = "sp-mixnet" -version = "0.4.0" +version = "0.12.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20046,7 +20035,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" -version = "26.0.0" +version = "34.0.0" dependencies = [ "array-bytes", "log", @@ -20056,17 +20045,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 +20066,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 +20095,7 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "26.0.0" +version = "32.0.0" dependencies = [ "rustc-hash", "serde", @@ -20116,7 +20105,7 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "31.0.1" +version = "39.0.0" dependencies = [ "docify", "either", @@ -20126,7 +20115,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -20137,34 +20126,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 +20145,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 +20178,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 +20193,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 +20203,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 +20222,7 @@ dependencies = [ [[package]] name = "sp-staking" -version = "26.0.0" +version = "34.0.0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -20275,7 +20234,7 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.35.0" +version = "0.43.0" dependencies = [ "arbitrary", "array-bytes", @@ -20283,12 +20242,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 +20258,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 +20308,7 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20378,29 +20319,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 +20337,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20421,9 +20350,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 +20360,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 +20377,7 @@ dependencies = [ [[package]] name = "sp-version" -version = "29.0.0" +version = "37.0.0" dependencies = [ "impl-serde", "parity-scale-codec", @@ -20457,14 +20386,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 +20404,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 +20415,7 @@ dependencies = [ [[package]] name = "sp-weights" -version = "27.0.0" +version = "31.0.0" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -20508,7 +20424,7 @@ dependencies = [ "serde", "smallvec", "sp-arithmetic", - "sp-debug-derive 14.0.0", + "sp-debug-derive", ] [[package]] @@ -20590,18 +20506,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 +20535,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 +20553,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 +20570,7 @@ dependencies = [ [[package]] name = "staging-parachain-info" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -20662,7 +20578,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -20671,7 +20586,7 @@ version = "2.0.0" [[package]] name = "staging-xcm" -version = "7.0.0" +version = "14.1.0" dependencies = [ "array-bytes", "bounded-collections", @@ -20692,7 +20607,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "7.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "frame-support", @@ -20714,7 +20629,6 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -20722,22 +20636,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 +20708,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 +20825,7 @@ dependencies = [ [[package]] name = "subkey" -version = "9.0.0" +version = "19.0.0" dependencies = [ "clap 4.5.3", "sc-cli", @@ -20922,7 +20833,7 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.7" +version = "0.6.0" dependencies = [ "bip39", "hmac 0.12.1", @@ -20956,7 +20867,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-support" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-support", "frame-system", @@ -20967,15 +20878,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 +20901,7 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "tokio", ] @@ -20998,7 +20910,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 +20932,7 @@ dependencies = [ "bp-polkadot-core", "bp-relayers", "bp-runtime", - "bridge-runtime-common", "equivocation-detector", - "finality-grandpa", "finality-relay", "frame-support", "frame-system", @@ -21040,9 +20952,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 +20964,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "jsonrpsee", @@ -21064,7 +20978,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" -version = "27.0.0" +version = "37.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -21116,7 +21030,6 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", - "hex-literal", "log", "pallet-babe", "pallet-balances", @@ -21139,7 +21052,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 +21061,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 +21094,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 +21105,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" -version = "4.0.0-dev" +version = "3.0.0" dependencies = [ "futures", "sc-service", @@ -21201,7 +21115,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "17.0.0" +version = "24.0.0" dependencies = [ "array-bytes", "build-helper", @@ -21217,7 +21131,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 +21307,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 +21422,7 @@ checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ "env_logger 0.11.3", "test-log-macros", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] @@ -21513,13 +21438,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 +21476,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "1.0.0" +version = "0.1.0" dependencies = [ "rustversion", "substrate-wasm-builder", @@ -21567,7 +21491,6 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std 14.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -21621,7 +21544,7 @@ dependencies = [ [[package]] name = "testnet-parachains-constants" -version = "1.0.0" +version = "9.0.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -21832,10 +21755,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 +21781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] @@ -21868,17 +21791,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 +21813,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 +21839,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 +21856,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", ] @@ -22000,7 +21923,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 +21932,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 +21965,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 +22003,7 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "7.0.0" +version = "15.0.0" dependencies = [ "coarsetime", "polkadot-primitives", @@ -22103,17 +22025,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 +22035,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 +22117,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.9", "thiserror", @@ -22264,7 +22143,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -22275,26 +22154,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 +22163,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 +22210,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 +22235,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -22481,6 +22340,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 +22366,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 +22474,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 +22519,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 +22697,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 +22725,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 +22748,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 +22771,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 +22953,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", @@ -23114,22 +23016,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 +23046,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 +23123,6 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rustc-hex", "scale-info", "serde", "serde_derive", @@ -23245,9 +23146,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 +23157,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 +23177,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 +23248,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 +23271,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 +23400,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 +23418,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 +23436,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 +23454,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 +23490,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 +23536,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 +23565,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 +23606,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 +23616,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 +23641,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 +23666,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 +23700,6 @@ dependencies = [ "scale-info", "sp-api", "sp-io", - "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-builder", @@ -23832,20 +23707,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 +23721,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 +23729,7 @@ dependencies = [ [[package]] name = "xcm-simulator-example" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "frame-system", @@ -23883,8 +23746,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 +23775,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 +23783,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 +23849,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..06af87112a36e 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"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "polkadot-v${version}"; - hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; + rev = "polkadot-${version}"; + hash = "sha256-g+jReHOAkaWjr1yJILFL4mSYGEfRBlSCrUHp8ro22SA="; # 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="; }; }; @@ -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/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 8e6fb1b388937..e4dc85f3c4d5e 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"; diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 35dc9b31e16ec..0d664374efa0b 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -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/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/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index b341ca102b86e..976c522880592 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.6.2"; + version = "24.7.2"; suffix = { aarch64-linux = "linux-arm64"; @@ -18,8 +18,8 @@ let src = fetchurl { 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-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA=="; - x86_64-linux = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg=="; + aarch64-linux = "sha512-RYkRav7U7WUbZuSvwuWf+IvKgkpUYrclW5vzINcVp/Wzqj3Brl0Cb1fC4dFe7c/UyE/K1oQ4++zd2dHJu6gxEQ=="; + x86_64-linux = "sha512-WmdH3IC+9tbSLtQirmawi6vgtR7GoFceN2FdZ94rGtCkrvhi9STz5RHfZAljyQfRZ9Xx+DlTChZrsWA6DNqBpg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 82b6d12153611..836532c00badd 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -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/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 e963a409ad617..11ca43c61436b 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -14,7 +14,7 @@ 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"; 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/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 9376dc476dec2..41ecfd40f4b5e 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,24 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, git, linux-pam, libxcb }: +{ stdenv, lib, fetchFromGitHub, linux-pam, libxcb, makeBinaryWrapper, zig_0_12 +, callPackage }: -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 ''; meta = with lib; { diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/applications/display-managers/ly/deps.nix new file mode 100644 index 0000000000000..0269a8e8190a9 --- /dev/null +++ b/pkgs/applications/display-managers/ly/deps.nix @@ -0,0 +1,112 @@ +# generated by zon2nix (https://github.com/Cloudef/zig2nix) + +{ + lib, + linkFarm, + fetchurl, + fetchgit, + runCommandLocal, + zig, + name ? "zig-packages", +}: + +with lib; + +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 = splitString "#" url; + base = elemAt parts 0; + rev = elemAt parts 1; + in + fetchgit { + inherit name rev hash; + url = base; + deepClone = false; + }; + + fetchZigArtifact = + { + name, + url, + hash, + }: + let + parts = splitString "://" url; + proto = elemAt parts 0; + path = 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/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 163948c90dbe4..a90d0c1706251 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1" - sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU="; + version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1" + sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI="; }; betaVersion = { - version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2" - sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8="; + version = "2024.1.2.10"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 2" + sha256Hash = "sha256-/LrHYyrOPfnSliM5XUOzENjJ+G+M1Ajw31tFAOsbfnQ="; }; latestVersion = { - version = "2024.1.2.7"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 7" - sha256Hash = "sha256-opoAKslh8DqS/iS5gw8AxX6x89t2BNX7yaU88XNd2kM="; + version = "2024.1.3.3"; # "Android Studio Ladybug | 2024.1.3 Canary 3" + sha256Hash = "sha256-Ps3jMtNAdfPitFeXIFKpjSyM4si4tp4MrS3r5VURFh4="; }; in { # Attributes are named by their corresponding release channels 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/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/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 6219ab2b7bd29..c7b8b3dc0f5c6 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}; }; }; @@ -241,6 +241,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 index b1a0440bb004f..c6e48e63c4a3f 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { description = "Relaxing mix of Vi and ACME"; homepage = "https://c9x.me/edit"; license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; mainProgram = "edit"; }; 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..6dd0c7f167c90 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -0,0 +1,37 @@ +# builder for Emacs packages built for packages.el + +{ lib, stdenv, emacs, texinfo, writeText, gcc }: + +let + handledArgs = [ "meta" ]; + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; + +in + +{ pname +, version +, src +, meta ? {} +, ... +}@args: + +genericBuild ({ + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + emacs --batch -Q -l ${./elpa2nix.el} \ + -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; +} + +// removeAttrs args handledArgs) 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..727b1f03cae4f --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -0,0 +1,103 @@ +# generic builder for Emacs packages + +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: + +let + inherit (lib) optionalAttrs getLib; + handledArgs = [ "buildInputs" "packageRequires" "propagatedUserEnvPkgs" "meta" ] + ++ lib.optionals (emacs.withNativeCompilation or false) [ "nativeBuildInputs" "postInstall" ]; + + 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 + ''; + +in + +{ pname +, version +, buildInputs ? [] +, nativeBuildInputs ? [] +, packageRequires ? [] +, propagatedUserEnvPkgs ? [] +, postInstall ? "" +, meta ? {} +, turnCompilationWarningToError ? false +, ignoreCompilationError ? true +, ... +}@args: + +stdenv.mkDerivation (finalAttrs: ({ + name = "emacs-${pname}-${finalAttrs.version}"; + + unpackCmd = '' + 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 + ''; + + buildInputs = [emacs texinfo] ++ packageRequires ++ buildInputs; + propagatedBuildInputs = packageRequires; + propagatedUserEnvPkgs = packageRequires ++ propagatedUserEnvPkgs; + + inherit setupHook; + + doCheck = false; + + meta = { + broken = false; + platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } // meta; +} + +// optionalAttrs (emacs.withNativeCompilation or false) { + + LIBRARY_PATH = "${getLib stdenv.cc.libc}/lib"; + + nativeBuildInputs = [ gcc ] ++ nativeBuildInputs; + + addEmacsNativeLoadPath = 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; +} + +// removeAttrs args handledArgs)) 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..6249f4e7f1866 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -0,0 +1,146 @@ +# builder for Emacs packages built for packages.el +# using MELPA package-build.el + +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: + +let + handledArgs = [ "meta" "preUnpack" "postUnpack" ]; + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; }; + + 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 + +{ /* + 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 ? (args.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 + */ +, recipe ? (writeText "${pname}-recipe" '' + (${ename} :fetcher git :url "" + ${lib.optionalString (files != null) ":files ${files}"}) + '') +, preUnpack ? "" +, postUnpack ? "" +, meta ? {} +, ... +}@args: + +genericBuild ({ + + elpa2nix = ./elpa2nix.el; + melpa2nix = ./melpa2nix.el; + + inherit packageBuild commit ename recipe; + + melpaVersion = + 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 version; + + preUnpack = '' + mkdir -p "$NIX_BUILD_TOP/recipes" + if [ -n "$recipe" ]; then + cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" + fi + + 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 = '' + runHook preBuild + + cd "$NIX_BUILD_TOP" + + emacs --batch -Q \ + -L "$NIX_BUILD_TOP/package-build" \ + -l "$melpa2nix" \ + -f melpa2nix-build-package \ + $ename $melpaVersion $commit + + runHook postBuild + ''; + + installPhase = '' + 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; +} + +// removeAttrs args handledArgs) 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..11c28c0133e40 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -0,0 +1,28 @@ +# trivial builder for Emacs packages + +{ callPackage, lib, ... }@envargs: + +args: + +callPackage ./generic.nix envargs ({ + buildPhase = '' + runHook preBuild + + emacs -L . --batch -f batch-byte-compile *.el + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR + emacs --batch -l package --eval "(package-generate-autoloads \"${args.pname}\" \"$LISPDIR\")" + + runHook postInstall + ''; +} + +// args) 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..59a694286d09e --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix @@ -0,0 +1,236 @@ +/* + +# 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, gcc }: +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; + nativeBuildInputs = lib.optional withNativeCompilation gcc; + } // 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/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 1ba0ea1519b06..acfafcacbef8f 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,10629 @@ { 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/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.20240709.193836"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240709.193836.tar"; + sha256 = "1spvk9z1gc522nq36mhyvn86cq9j64chd3mkizj21j93wkd5i3gy"; + }; + 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.20240613.140459"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar"; + sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy"; + }; + 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.20240712.45742"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240712.45742.tar"; + sha256 = "0a4zbpb58mdcmfq7vfwbsqhcfghxx8c3fkvwsrlg5a3gdcjv4ymv"; + }; + 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.6.0.20240630.205810"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240630.205810.tar"; + sha256 = "0d1pkrqghyz2fqf7qs1yxnibjq0c7a0633j4kq7aqahcb9izpzj1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-cont-latexmk = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-label-numbers = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + 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.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.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/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.20240621.221659"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar"; + sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp"; + }; + 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.20240710.192144"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cape-1.5.0.20240710.192144.tar"; + sha256 = "0kg9qv8qkcs2v3x1dkyg3j1zxqql000bhbdh7awfk42dfq181lcj"; + }; + 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.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/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.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 + 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.20240713.30311"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240713.30311.tar"; + sha256 = "166sgcwvwysvnlwm91bz2c4k85y846qflpg80ywyhnjklskldjh9"; + }; + 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 = "30.0.0.0.0.20240708.182228"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240708.182228.tar"; + sha256 = "0qgr35606hqz5x6161lwq8zv15z08pm1xbfv32qgzpszmyj8855d"; + }; + 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.7.0.20240710.202854"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-1.7.0.20240710.202854.tar"; + sha256 = "0l4w88530qh65m5wkh8i5z2sv3zfm1jylr3885s550ix0dq45503"; + }; + 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.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 + 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.4.0.20240711.184800"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/corfu-1.4.0.20240711.184800.tar"; + sha256 = "0fvpsblz8750vlnv4mbwh0zz90xn35svbii2hyz2ngzb0yjrygch"; + }; + 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.25.0.20240529.65338"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/csv-mode-1.25.0.20240529.65338.tar"; + sha256 = "0rr4gz38y1gyzg8mwyl62macjq31rs6fvx3pngamyq1y3ghpivsb"; + }; + 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.13.0.0.20240711.211516"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dape-0.13.0.0.20240711.211516.tar"; + sha256 = "13wzg3z8pfd0gydld2np2bih7bpmpvm98m6z5cwmc2bfh20p8xpa"; + }; + 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 = "3.0.6.0.20240712.154245"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-3.0.6.0.20240712.154245.tar"; + sha256 = "134s5mgkrsi65skvhqic89ch9806ln6s9glhh8dz552yb46pwbdd"; + }; + 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.20240712.110155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20240712.110155.tar"; + sha256 = "182dbr5hay13nca52qyymmrsmfcwd62ncayjh76ii0jn3khbcqzf"; + }; + 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.20240702.202011"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240702.202011.tar"; + sha256 = "12i8vl4jiv3v952h7amlmzkvvdpdfmfj77xz3hyjyrr6zvdhygls"; + }; + 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.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 = [ 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.20240603.71909"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240603.71909.tar"; + sha256 = "0fjs0k36xm2sy3p0yi2km7pcrjv3f0gsc6qbrh47qimn7x5b9bkh"; + }; + 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 = "20240710.0.20240710.214351"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eev-20240710.0.20240710.214351.tar"; + sha256 = "120yka4xv6zqcd7gi6c4qlgydyqv86s15p444jsjiz57zvc5p991"; + }; + 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.20240605.183445"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240605.183445.tar"; + sha256 = "09zmi2rsykdjkmj7hdylsqhqfd87i1g2g4v6sizm94s0hmvxa148"; + }; + 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.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240707.154630.tar"; + sha256 = "0f7lbbsh5y4945j8115ph5i2k9c3r0ipcxhmig9kvba6knrshgin"; + }; + 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.20240708.123037"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar"; + sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in"; + }; + 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.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/packages/elisp-benchmarks.html"; + license = lib.licenses.free; + }; + } + ) { }; + ellama = callPackage ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + llm, + spinner, + }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.11.9.0.20240710.202758"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ellama-0.11.9.0.20240710.202758.tar"; + sha256 = "01qfp01lgs84xzzkkky4539bvmakf3xbgr1h57asfsy3j50nsblf"; + }; + packageRequires = [ + compat + 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.20240607.161338"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/embark-1.1.0.20240607.161338.tar"; + sha256 = "14ar8sfjrk1q6f2dis2w8qa8nsqla8cz91l4nsssr1mfgs7x517b"; + }; + 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.20240607.161338"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240607.161338.tar"; + sha256 = "1m48pddbyxpi7ji9cl0pd4npkl6xj7fdak4raacglbgayg4z9qdb"; + }; + 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.16pre0.20240707.203749"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar"; + sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2"; + }; + 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 = "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/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.6.1snapshot0.20240709.13309"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240709.13309.tar"; + sha256 = "1ijn2rwl2lpqckps4xxqxsn6385y84xmid83a2cj4fkkgjks7jnv"; + }; + 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.20240616.203826"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240616.203826.tar"; + sha256 = "1zg7v08wbk8ma5k2zj0jrchf2wz483bklgi0rshjividniy99877"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/external-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + exwm = callPackage ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + xelb, + }: + elpaBuild { + pname = "exwm"; + ename = "exwm"; + version = "0.31.0.20240708.212458"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240708.212458.tar"; + sha256 = "0cb9y753d7gj40wfwg4my339kiffdydch1bmhdqw1haf3a21srar"; + }; + packageRequires = [ + compat + 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.1.0.20240707.120050"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar"; + sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1"; + }; + 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.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar"; + sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi"; + }; + 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.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/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 ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "greader"; + ename = "greader"; + version = "0.11.13.0.20240712.232251"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/greader-0.11.13.0.20240712.232251.tar"; + sha256 = "08gajcssq4h84r61sh1hpg86dklrh86slvd3q5b65nlwps5mslh6"; + }; + packageRequires = [ + compat + emacs + 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.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.8.0.20240712.131914"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gtags-mode-1.8.0.20240712.131914.tar"; + sha256 = "1rzmgzirxxrhm8f3vbwf76nrrzd1svf4ddy20h0khp7ycldhd3hp"; + }; + 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.20240528.185800"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar"; + sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6"; + }; + 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.20240707.235928"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240707.235928.tar"; + sha256 = "1rrj0zmc5wfrdzzwpihpxrw6xawswnkszb1753p5sg3sxmj5h2kw"; + }; + 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.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/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.20240524.114155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar"; + sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9"; + }; + 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.9.0.20240708.212221"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jinx-1.9.0.20240708.212221.tar"; + sha256 = "10lp9pnlxaxr1rblkg3996m6bvhdkqhc4my8gxbswxsv9djaw621"; + }; + 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.20240604.141707"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240604.141707.tar"; + sha256 = "0qz81zrqhdymir9kbmkyavb591abv2j5iz1in2y0v96hpilxfdw6"; + }; + 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.20240616.203826"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240616.203826.tar"; + sha256 = "0jkhhds21vw4i03ya8lflkkh0yaqxqhj49zdzb1l7wgsb499hhya"; + }; + 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; + }; + } + ) { }; + literate-scratch = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/literate-scratch.html"; + license = lib.licenses.free; + }; + } + ) { }; + llm = callPackage ( + { + elpaBuild, + emacs, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.16.1.0.20240706.201250"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/llm-0.16.1.0.20240706.201250.tar"; + sha256 = "0kx90fqdsp762774f07jb4m9vr4lnimls45g4a16rq7xy783cd57"; + }; + 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.5.0.20240610.183057"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar"; + sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf"; + }; + 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.20240710.95347"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240710.95347.tar"; + sha256 = "1943srwzm6w4ixcb48d968pbf4hs3y3rwcmcnryh8az2q3j6sqgm"; + }; + 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.20240709.63840"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240709.63840.tar"; + sha256 = "19yys9lkfsrcbib4rd0ph8d1a3698bih0ghihpb7i1mxy2x0dxwj"; + }; + 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 = "2.0.20240614.95804"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar"; + sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3"; + }; + 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.20240624.80231"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar"; + sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk"; + }; + 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.20240711.200241"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240711.200241.tar"; + sha256 = "04ambf76p24z45b5zswbqprbvy31vdg48mk36dmd85apl0myvi95"; + }; + 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.8pre0.20240712.111340"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-9.8pre0.20240712.111340.tar"; + sha256 = "1nqx0kvmxf7prfip30l1br9gl2s7bmcacds5ifafawywnc720jl6"; + }; + 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.20240609.105801"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240609.105801.tar"; + sha256 = "1rx5lnn151wn42zpnrr64g1qn5lvk0syfqm2v4h58np7lsf10c2y"; + }; + 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.3.0.20240708.215718"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-modern-1.3.0.20240708.215718.tar"; + sha256 = "1r3hk48781j375c307dp3mgb662nk223g6cqfbv72jhqbis7770g"; + }; + 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.20240629.103632"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar"; + sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm"; + }; + 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.16.0.20240618.91747"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar"; + sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i"; + }; + 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.20240708.215736"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/osm-1.3.0.20240708.215736.tar"; + sha256 = "12w8mgm7b3hg4h6yks0a1z2sy22b91gk5qsbs014ymq1z4mg38m3"; + }; + 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.20240617.162224"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar"; + sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4"; + }; + 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.1.0.20240615.190609"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240615.190609.tar"; + sha256 = "0qncm2q42y4xqijx468cpvbh841nw9fk27mm5zdc3l792i0i29y4"; + }; + 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.9.0.20240610.142147"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-0.9.0.20240610.142147.tar"; + sha256 = "1jbm07jw7kw2s57q4d0l6r8zxwjj1mi9kx37ppdqv28dbjmbln1r"; + }; + 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.20240607.160859"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240607.160859.tar"; + sha256 = "02wv00dij35crkff82plxlkwgninjnllpc44lq0ynxwk1lgx3q5a"; + }; + 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.20240607.134302"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240607.134302.tar"; + sha256 = "1q6a4yyy339l2crc24mssxansmpmhq401h3mcqkzkcw60xh9wsr8"; + }; + 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.20240701.211603"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar"; + sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk"; + }; + 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.20240703.35906"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar"; + sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj"; + }; + 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; + }; + } + ) { }; + preview-auto = callPackage ( + { + auctex, + elpaBuild, + emacs, + fetchurl, + lib, + }: + elpaBuild { + pname = "preview-auto"; + ename = "preview-auto"; + version = "0.3.0.20240629.205058"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240629.205058.tar"; + sha256 = "12qmpx9lamxkwkvximygqkczyvwxv6dn8zyv8x55v2qiav0vcp1r"; + }; + packageRequires = [ + auctex + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-auto.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-tailor = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-tailor.html"; + license = lib.licenses.free; + }; + } + ) { }; + project = callPackage ( + { + elpaBuild, + emacs, + fetchurl, + lib, + xref, + }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.11.1.0.20240614.152748"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240614.152748.tar"; + sha256 = "0izv7szsi3gqqafdjrqnpy3znsk1izr2zkcyc45jiyv5bafd76ik"; + }; + 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.20240708.74355"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar"; + sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i"; + }; + 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.2.0.20240606.194313"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar"; + sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm"; + }; + 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.20240712.91350"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240712.91350.tar"; + sha256 = "11qma2a8cph3q87bma8jwb8q4vfqdqs7gmb88yw8ywil76p6jdms"; + }; + 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.20240624.85758"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar"; + sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln"; + }; + 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.14pre0.20240703.212805"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14pre0.20240703.212805.tar"; + sha256 = "0sdjfryyg0lgr8mry0v662j9m3kaqcap6f73s4ds81yc67y30qbg"; + }; + 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.20240708.212025"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240708.212025.tar"; + sha256 = "0jlqq91w8rwqkd6knqlpw9218xqblfqw253406q4an820rxkzx7l"; + }; + 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; + }; + } + ) { }; + tex-item = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-item.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-parens = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-parens.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.20240604.221628"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar"; + sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf"; + }; + 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.7.1.0.20240629.82953"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tramp-2.7.1.0.20240629.82953.tar"; + sha256 = "0kf7l5v84hqhbxzvg6xmffs8b03shd6062wjxfxy9z8y9xb6zpar"; + }; + 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.7.2.0.20240629.150812"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/transient-0.7.2.0.20240629.150812.tar"; + sha256 = "02d73zfxcbk2p5pzs5j2hv0qznj2zbjyjd6xhinpxx657w1c3zsx"; + }; + 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.20240530.111648"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240530.111648.tar"; + sha256 = "160h7jzbkf1igaz49sp9gw30471qmw9b28h2pq9r8f1varkvy9an"; + }; + 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.20240708.120317"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240708.120317.tar"; + sha256 = "1kp1mh2hm6yhwchkr1vxpnnajdc378knwkmf88vky2ygnnscczy7"; + }; + 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.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/packages/verilog-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + vertico = callPackage ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + }: + elpaBuild { + pname = "vertico"; + ename = "vertico"; + version = "1.8.0.20240711.185118"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240711.185118.tar"; + sha256 = "1wsybijh4h46swlxx7viz0wiwh5hbkh4q3a51r60flvys90cjkgz"; + }; + 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.20240625.112213"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240625.112213.tar"; + sha256 = "1shjn6bqnwr8fxccfz86dpwvyqw0crmrn7pb60dwvvjmxqfm0aj6"; + }; + 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 ( + { + compat, + elpaBuild, + emacs, + 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 + 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 ( + { + compat, + elpaBuild, + emacs, + 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 + 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.7.0.0.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar"; + sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7"; + }; + 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; + }; + } + ) { }; +} 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..a0fdf0e1cbc72 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -22,7 +22,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }: +{ lib, pkgs, buildPackages }: self: let @@ -32,11 +32,6 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText gcc; - inherit (self) emacs; - }; - # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -64,26 +59,6 @@ self: let ''; }); - 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 ]; }); @@ -119,6 +94,6 @@ self: let elpaDevelPackages = super // overrides; - 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..9610c40702628 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -1,6780 +1,10388 @@ { 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, + 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.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar"; + sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-cont-latexmk = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-label-numbers = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + 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, + 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.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar"; + sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs"; + }; + 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 = "30.0.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar"; + sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl"; + }; + 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.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-1.7.tar"; + sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c"; + }; + 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.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar"; + sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1"; + }; + 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.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/corfu-1.4.tar"; + sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85"; + }; + 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.25"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar"; + sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984"; + }; + 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.13.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dape-0.13.0.tar"; + sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a"; + }; + 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 = "3.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-3.0.6.tar"; + sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv"; + }; + 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.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar"; + sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz"; + }; + 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 = "20240710"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eev-20240710.tar"; + sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02"; + }; + 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 ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + llm, + spinner, + }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.11.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar"; + sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j"; + }; + packageRequires = [ + compat + 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.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ement-0.15.1.tar"; + sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld"; + }; + 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 = "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, + 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.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.6.tar"; + sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s"; + }; + 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 ( + { + compat, + elpaBuild, + emacs, + 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 + emacs + 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.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar"; + sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i"; + }; + 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.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, + 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 ( + { + compat, + elpaBuild, + emacs, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "greader"; + ename = "greader"; + version = "0.11.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/greader-0.11.13.tar"; + sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn"; + }; + packageRequires = [ + compat + emacs + 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, + emacs, + fetchurl, + lib, + }: + elpaBuild { + pname = "gtags-mode"; + ename = "gtags-mode"; + version = "1.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar"; + sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll"; + }; + 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; + }; + } + ) { }; + 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.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.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jinx-1.9.tar"; + sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1"; + }; + 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; + }; + } + ) { }; + literate-scratch = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/literate-scratch.html"; + license = lib.licenses.free; + }; + } + ) { }; + llm = callPackage ( + { + elpaBuild, + emacs, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.16.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/llm-0.16.1.tar"; + sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s"; + }; + 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.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar"; + sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x"; + }; + 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 = "2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mpdired-2.tar"; + sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23"; + }; + 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.7.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-9.7.6.tar"; + sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng"; + }; + 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.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-modern-1.3.tar"; + sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj"; + }; + 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.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orgalist-1.16.tar"; + sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3"; + }; + 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, + emacs, + 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 = [ emacs ]; + 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.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-0.9.tar"; + sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8"; + }; + 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; + }; + } + ) { }; + preview-auto = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-auto.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-tailor = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-tailor.html"; + license = lib.licenses.free; + }; + } + ) { }; + project = callPackage ( + { + elpaBuild, + emacs, + 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 = [ + 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.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar"; + sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28"; + }; + 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; + }; + } + ) { }; + tex-item = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-item.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-parens = callPackage ( + { + auctex, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-parens.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.7.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar"; + sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8"; + }; + 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.7.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transient-0.7.2.tar"; + sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby"; + }; + 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 ( + { + compat, + elpaBuild, + emacs, + 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 + 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 ( + { + compat, + elpaBuild, + emacs, + 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 + 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.7.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.7.0.tar"; + sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24"; + }; + 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; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3e8ab4625fec2..8bffb346dedd5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -22,7 +22,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }: +{ lib, pkgs, buildPackages }: self: let @@ -32,11 +32,6 @@ self: let }); }; - elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText gcc; - inherit (self) emacs; - }; - # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -141,26 +136,6 @@ self: let }; }); - 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; @@ -208,6 +183,7 @@ self: let elpaPackages = super // overrides; - 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/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..34469eb196288 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -4,127 +4,45 @@ 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 { }; + codeium = callPackage ./manual-packages/codeium { + inherit (pkgs) codeium; + }; lsp-bridge = callPackage ./manual-packages/lsp-bridge { - inherit (pkgs) python3 git go gopls pyright; + inherit (pkgs) basedpyright git go gopls python3; }; - lspce = callPackage ./manual-packages/lspce { }; - matrix-client = callPackage ./manual-packages/matrix-client { _map = self.map; }; - 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 { }; - 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 { }; - # 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 + 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..07e909b34a681 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix @@ -0,0 +1,34 @@ +{ + 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 + ]; + + 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..1e411af1a871b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix @@ -0,0 +1,27 @@ +{ + lib, + melpaBuild, + lsp-bridge, + yasnippet, +}: + +melpaBuild { + pname = "acm"; + version = lsp-bridge.version; + + src = lsp-bridge.src; + + packageRequires = [ yasnippet ]; + + files = ''("acm/*.el" "acm/icons")''; + + 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..5eec518036eab --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix @@ -0,0 +1,15 @@ +{ melpaBuild, haskellPackages }: +let + Agda = haskellPackages.Agda; +in +melpaBuild { + pname = "agda2-mode"; + inherit (Agda) src version; + + files = ''("src/data/emacs-mode/*.el")''; + + 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/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix index 3ab796bcbd196..3ab796bcbd196 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix 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..59be7f543d1c5 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,38 @@ -{ 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"; }) ]; + 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 deleted file mode 100644 index e6e53f96f6590..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, consult -, embark -, forge -, gh -, markdown-mode -, writeText -, unstableGitUpdater -}: - -let - commit = "1fe876d9552b6ec6af257a4299a34eca99b40539"; -in -melpaBuild { - pname = "consult-gh"; - version = "20230706.438"; - - inherit commit; - - src = fetchFromGitHub { - owner = "armindarvish"; - repo = "consult-gh"; - rev = commit; - hash = "sha256-bi+qlNvNMXbS4cXbXt01txwD2NAyAqJGNKeOtdtj7tg="; - }; - - packageRequires = [ - consult - embark - 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")) - ''; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - homepage = "https://github.com/armindarvish/consult-gh"; - description = "GitHub CLI client inside GNU Emacs using Consult"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix new file mode 100644 index 0000000000000..03adc5fd1f78f --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix @@ -0,0 +1,41 @@ +{ + lib, + consult, + embark, + fetchFromGitHub, + forge, + gh, + markdown-mode, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "consult-gh"; + version = "1.0-unstable-2024-08-02"; + + src = fetchFromGitHub { + owner = "armindarvish"; + repo = "consult-gh"; + rev = "e12b24e68116ac6c171d628c547c017458d6aa2b"; + hash = "sha256-skZkpYUWncGUf9k0IfEq3LAqDXHIfCJJ3p3b3ey+Rks="; + }; + + packageRequires = [ + consult + embark + forge + markdown-mode + ]; + + propagatedUserEnvPkgs = [ gh ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/armindarvish/consult-gh"; + description = "GitHub CLI client inside GNU Emacs using Consult"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} 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..5a352c5c3bc49 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,22 @@ -{ 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"; - 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..2225dff0872d6 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -0,0 +1,46 @@ +{ + 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 ]; + + 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 07e234fca98b7..b6c53e26c5ed0 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,7 +2,6 @@ lib, melpaBuild, fetchzip, - writeText, }: melpaBuild rec { @@ -14,15 +13,6 @@ melpaBuild rec { 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) - ''; - meta = { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; description = "Major modes for Gentoo package files"; 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..b69423e583310 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -0,0 +1,32 @@ +{ + 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")''; + + 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..3bc5b686e5488 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + libffi, + melpaBuild, + pkg-config, + unstableGitUpdater, +}: + +melpaBuild { + pname = "elisp-ffi"; + version = "1.0.0-unstable-2017-05-18"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "elisp-ffi"; + rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; + hash = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libffi ]; + + preBuild = '' + mv ffi.el elisp-ffi.el + make + ''; + + 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..fea6905e6f31f 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,15 @@ 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"; + 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..57249b72fbb86 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,17 @@ trivialBuild rec { hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8="; }; - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ + packageRequires = [ evil markdown-mode ]; - meta = with lib; { + 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..93d963a09e08d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -0,0 +1,28 @@ +{ + 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="; + }; + + 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..b1a490fb2c9b7 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix @@ -0,0 +1,27 @@ +{ + 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="; + }; + + 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/grid/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix index 91b69b0fbbda2..0b8b5108043c4 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,8 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; + 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..8e99b427cb44c 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,30 @@ -{ 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; { + 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..efa79b9ebb05e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix @@ -0,0 +1,23 @@ +{ + 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 ]; + + 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..59b584d9f9c85 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "icicles"; + version = "0-unstable-2023-07-27"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "icicles"; + rev = "dfc1d9caf1b5156567292c9548547a2975a841bc"; + hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI="; + }; + + 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..2a7b7b571d12e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix @@ -0,0 +1,35 @@ +{ + 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 + ]; + + 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..84dd7a1941664 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix @@ -0,0 +1,31 @@ +{ + 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="; + }; + + 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..c97d3cc2d4917 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -0,0 +1,27 @@ +{ + 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="; + }; + + 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..418f201fa933b 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,15 @@ 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 + ''; + + 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/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix new file mode 100644 index 0000000000000..3be4a3b56b969 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -0,0 +1,29 @@ +{ + lib, + melpaBuild, + fetchFromGitLab, + unstableGitUpdater, +}: + +melpaBuild { + pname = "ligo-mode"; + version = "1.7.1-unstable-2024-07-17"; + + src = fetchFromGitLab { + owner = "ligolang"; + repo = "ligo"; + rev = "09afc3ff3dd9c88b2dfbc563278a78a099b39902"; + hash = "sha256-AX0zZljZPrfBlpdgCNuiq0JaYpHcVBdHHZ9jM31LlQs="; + }; + + 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 = [ ]; + }; +} 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..9fef79b3312dd 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,13 +1,12 @@ -{ 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") ''; meta = { 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 944fc6c49463b..7b879d1248e04 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 = "9e88e660d717ba597d9fe9366cf4278674734410"; - 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 = "20240629.1404"; + version = "0-unstable-2024-07-27"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - inherit rev; - hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA="; + rev = "92d58ff0fb938ced513d690e0daadef74737e5d4"; + hash = "sha256-qeoKPwK3qKcvUFchaQYCCQmSlXgN+Tt2kU+lXqiUwaw="; }; - commit = rev; - patches = [ # Hardcode the python dependencies needed for lsp-bridge, so users # don't have to modify their global environment @@ -54,26 +53,24 @@ 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; @@ -90,27 +87,15 @@ 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 - - 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..1a1f8612f64ec --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage { + pname = "lspce-module"; + version = "1.1.0-unstable-2024-07-14"; + + src = fetchFromGitHub { + owner = "zbelial"; + repo = "lspce"; + rev = "fd320476df89cfd5d10f1b70303c891d3b1e3c81"; + hash = "sha256-KnERYq/CvJhJIdQkpH/m82t9KFMapPl+CyZkYyujslU="; + }; + + cargoHash = "sha256-I2OobRu1hc6xc4bRrIO1FImPYBbFy1jXPcTsivbbskk="; + + checkFlags = [ + # flaky test + "--skip=msg::tests::serialize_request_with_null_params" + ]; + + # rename module without changing either suffix or location + # use for loop because there seems to be two modules on darwin systems + # https://github.com/zbelial/lspce/issues/7#issue-1783708570 + postInstall = '' + for f in $out/lib/*; do + mv --verbose $f $out/lib/lspce-module.''${f##*.} + done + ''; + + 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..78325d90bf78d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix @@ -0,0 +1,34 @@ +{ + 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.*")''; + + 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 index a17689ddf52dc..59f4b83681391 100644 --- 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 @@ -1,46 +1,42 @@ -{ 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 +{ + lib, + melpaBuild, + fetchFromGitHub, + fetchpatch, + # 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 { +melpaBuild { pname = "matrix-client"; version = "0.3.0"; - commit = rev; - src = fetchFromGitHub { owner = "alphapapa"; repo = "matrix-client.el"; - inherit rev; - sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"; + rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; + hash = "sha256-GLM8oCbm6PdEZPsM0ogMtNJr8mWjCKoX6ed5AUrYjuk="; }; patches = [ # Fix: avatar loading when imagemagick support is not available (fetchpatch { url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; - sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; + hash = "sha256-dXUa/HKDe+UjaXYTvgwPdXDuDcHB2HLPGWHboE+Lex0="; }) ]; @@ -62,10 +58,6 @@ in melpaBuild { 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..430b8af291a4b 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 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..324db6dede1f2 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + melpaBuild, + fetchFromGitHub, + hydra, + ivy, + pkg-config, + tclap, + unstableGitUpdater, + xapian, + # Configurable options + # Include pre-configured hydras + withHydra ? false, + # Include Ivy integration + withIvy ? false, +}: + +let + pname = "notdeft"; + version = "0-unstable-2021-12-04"; + + 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; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + tclap + xapian + ]; + + buildPhase = '' + runHook preBuild + + $CXX -std=c++11 -o notdeft-xapian xapian/notdeft-xapian.cc -lxapian + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp notdeft-xapian $out/bin + + runHook postInstall + ''; + }; +in +melpaBuild { + inherit pname version src; + + packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy; + + postPatch = '' + substituteInPlace notdeft-xapian.el \ + --replace 'defcustom notdeft-xapian-program nil' \ + "defcustom notdeft-xapian-program \"${notdeft-xapian}/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"''}) + ''; + + passthru = { + inherit notdeft-xapian; + 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..ac208e29dbf44 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix @@ -0,0 +1,22 @@ +{ 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 + ''; + + 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..51c4fb1f8b1f3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -0,0 +1,35 @@ +{ + 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/ $sourceRoot/ChangeLog $sourceRoot/README + ''; + + 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..41ce7957e758f --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -0,0 +1,25 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + js2-mode, +}: + +melpaBuild { + pname = "prisma-mode"; + version = "0-unstable-2021-12-07"; + + packageRequires = [ js2-mode ]; + + src = fetchFromGitHub { + owner = "pimeys"; + repo = "emacs-prisma-mode"; + rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; + hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; + }; + + meta = { + description = "Major mode for Prisma Schema Language"; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix index 3e804551666cd..41c9363fbf4af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix @@ -1,14 +1,24 @@ -{ lib, trivialBuild, fetchurl }: +{ + lib, + melpaBuild, + fetchurl, +}: -trivialBuild { +melpaBuild { pname = "prolog-mode"; + ename = "prolog"; version = "1.28"; src = fetchurl { url = "https://bruda.ca/_media/emacs/prolog.el"; - sha256 = "ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk="; + hash = "sha256-ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk="; }; + postPatch = '' + substituteInPlace prolog.el \ + --replace-fail ";; prolog.el ---" ";;; prolog.el ---" + ''; + meta = { homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; 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..aee5c8ba2dbf6 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,30 @@ -{ 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; { + 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/package.nix index f21e79c8f33d8..0238bb6127bdb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "Small session management for emacs"; homepage = "https://emacs-session.sourceforge.net/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } 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..7cf5a63f4b6cf 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,7 @@ trivialBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; - buildInputs = [ - emacs - ]; + 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..0227fcefc152a 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,22 @@ -{ 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"; + 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..ca83eb04a336f 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,14 @@ -{ lib -, trivialBuild -, texpresso +{ + lib, + melpaBuild, + texpresso, }: -trivialBuild { +melpaBuild { pname = "texpresso"; version = texpresso.version; src = texpresso.src; - preInstall = '' - cd emacs - ''; + files = ''("emacs/*.el")''; 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..5f04332db117f 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 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/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix index 018299650a9a4..d69a2f16247b1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix @@ -3,9 +3,6 @@ , melpaBuild , fetchFromGitHub , rustPlatform -, writeText -, clang -, llvmPackages , runtimeShell , writeScript @@ -26,15 +23,8 @@ let 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 { 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..d5b597bdf47b8 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,9 @@ trivialBuild { flycheck ]; - postUnpack = '' - sourceRoot=$sourceRoot/src/elisp - ''; + files = ''("src/elisp/*.el")''; + + dontConfigure = true; 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..dbbec44f9ccc2 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -0,0 +1,58 @@ +{ + lib, + avy, + bind-key, + cl-lib, + company, + company-quickhelp, + default-text-scale, + f, + fetchFromGitHub, + helm, + json-rpc-server, + melpaBuild, + nav-flash, + porthole, + unstableGitUpdater, + yasnippet, +}: + +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 + ]; + + 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..e4bb260d14b44 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,22 @@ -# 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"; - - 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..2981cb8f47112 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,22 @@ -{ 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"; + 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/package.nix index ec25ab9b1bdf8..d3e5a5cfbbb3b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, }: -trivialBuild { +melpaBuild { pname = "youtube-dl"; version = "1.0-unstable-2018-10-12"; @@ -12,14 +13,15 @@ trivialBuild { owner = "skeeto"; repo = "youtube-dl-emacs"; rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4"; - sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; + hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; - meta = with lib; { + passthru.updateScript = unstableGitUpdater { }; + + meta = { 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; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ leungbk ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 00646b6d81b38..d580b0dfdb71f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -755,5 +755,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-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix new file mode 100644 index 0000000000000..45ab57b45f72b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -0,0 +1,5243 @@ +{ 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.20240623.232746"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240623.232746.tar"; + sha256 = "0h5cfjdvm1dx5dmdz8i3nk7h2kjs3w224jjb9c1agj3m6bh2kjbm"; + }; + 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.20240723.73804"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240723.73804.tar"; + sha256 = "0l0fj27b0xxbv3y513i6jqc92bazcgbcrr8ij7vy7r5s14cin9x3"; + }; + 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 = "202405290611.0.20240722.23216"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202405290611.0.20240722.23216.tar"; + sha256 = "1ldl6pb1dk75zgmf92x35zv5wxn6hhj9ljj33kyf3pbw3jpmaljw"; + }; + 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.20240616.234552"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240616.234552.tar"; + sha256 = "12cb4h3w6j0hissma1p9q173q9g379b01h8359wrj9ynbyrvdbsh"; + }; + 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.7.4.0.20220125.104446"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/drupal-mode-0.7.4.0.20220125.104446.tar"; + sha256 = "03j8qa0yh382mr5jzlgyh60v9xaln1a3rs101cvnd9sibbw08p4g"; + }; + 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.20240728.171401"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240728.171401.tar"; + sha256 = "0hjmhg81yrbxz307id9vfys91nfsbhbsx29w00rgiy8b80c63ycy"; + }; + 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 = "3.1.1.50snapshot0.20240714.182430"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/emacsql-3.1.1.50snapshot0.20240714.182430.tar"; + sha256 = "03x0niccgc3iscz2pdbc86x4haf75kmp090knmsc1h5qwx5b2mxi"; + }; + 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.20240721.204520"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240721.204520.tar"; + sha256 = "1fqxqzdlrm9i7ipkn0yvn18yh8yi3mqilnadm389k1lylw4aqamj"; + }; + 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.1.0.20240712.120235"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.1.0.20240712.120235.tar"; + sha256 = "1hvqxzjnygsg74cjlhnk9c22rwwizwnn5zkb1g7f8ifykzmvmxr7"; + }; + 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 = "3.3.0.50snapshot0.20240727.200453"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/git-commit-3.3.0.50snapshot0.20240727.200453.tar"; + sha256 = "0whszyd51qzkng3fxpbr4p6vvly6b8w6n6879dq7swv0r9al4rdf"; + }; + 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.3.0.20240713.191814"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.3.0.20240713.191814.tar"; + sha256 = "1rlr9cvz9vnxdzrwbr9vcs5wis6a987yr465c5mhqly8m506jmn2"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/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.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.20240724.131301"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240724.131301.tar"; + sha256 = "0acyy66gxdm134k9k2jag69y7sk7c56x8grmq0b7xq919ixdjky4"; + }; + 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.20240728.45939"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240728.45939.tar"; + sha256 = "0gbnn8d0aki55l959pxbhzp5039zzjijxga5lbiwgh9h5dnj3kan"; + }; + 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.20240728.45939"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240728.45939.tar"; + sha256 = "1fz4vrk85df684vsgy38iwrsvdhz4ydriws09bkzicx3nxmyh8rj"; + }; + 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.20240728.163952"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240728.163952.tar"; + sha256 = "00c67xdm2rypdcxd5v0n683csnd4abiyn85mbly66vkjiw472fi8"; + }; + 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.0.0.20240713.191915"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.0.0.20240713.191915.tar"; + sha256 = "13kmc4gif26mgwdvc6zid095i6qlyrhzbl3lv10hzli28n0jqqdm"; + }; + 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 = "3.3.0.50snapshot0.20240727.200453"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/magit-3.3.0.50snapshot0.20240727.200453.tar"; + sha256 = "1ba1wkw56h0srxvms02ifvvp817p6rs501grcaqkmi70cp73lvkp"; + }; + 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 = "3.3.0.50snapshot0.20240727.200453"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-3.3.0.50snapshot0.20240727.200453.tar"; + sha256 = "1d16s26yzgzd9rz3jnvxj67aq5zn3hgsfksv4jb87vvnnfq2f7hk"; + }; + 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.24.0.20240701.160422"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.24.0.20240701.160422.tar"; + sha256 = "0h2q0wwlcsaz5ck8758l893spmg3hl6g4jpj7mgbc0qhv2bw1vzf"; + }; + 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.20240712.182147"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240712.182147.tar"; + sha256 = "1bq8aybbs0nfzinsw3l64naygsxpjvpckism0n8i3kyriq275pj8"; + }; + 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.2.0.20240129.232731"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.2.0.20240129.232731.tar"; + sha256 = "1a9pjvn9w138b4417gkdvcjvw9d68pqx5g6sjplldf6z23p3d6bp"; + }; + 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 = "1.9.0.0.20240713.192819"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/orgit-1.9.0.0.20240713.192819.tar"; + sha256 = "0gb73cyxhqi4cflnha9dzcnvs8l7nb3ksskq8psfdrs4h6ra3xhm"; + }; + 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.20240212.110040"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240212.110040.tar"; + sha256 = "0gbci7zwfwj8g69dla72arj3s5w49y6wgwcrilnlfmm3fc1h9lqy"; + }; + 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.20240718.150548"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240718.150548.tar"; + sha256 = "1kp29m0cjsq9hfy73z9rgzvl8c8ag4mb49hkh5y6w6f8pjv36va7"; + }; + 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.20240705.225542"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240705.225542.tar"; + sha256 = "1rl0zpip9qpkcb5hqj3xbamrarmcvpjxhnbms9kzqay3xws5i214"; + }; + 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.20240501.111815"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240501.111815.tar"; + sha256 = "0zpcad35ig5ci2a4rd9v3146c12mj7c9zhafwxvbmjhzd5aqfv82"; + }; + 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.20240715.144003"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240715.144003.tar"; + sha256 = "14d22bdm33jbwv9dphqydgww93scqdfbkjg80iivb48s0br86qld"; + }; + 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.20240724.160938"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240724.160938.tar"; + sha256 = "14xcgbi52dbs3kiqci810l7hjvxln00ifib21d6hisx0lhs5743l"; + }; + 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.19.0.20240413.145507"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.19.0.20240413.145507.tar"; + sha256 = "1vx54jl4r0nw3bpdphn206ia7x4a0pf8sdfsh46qx4jva5mgvg6j"; + }; + 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.0.0.20240725.142901"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.0.0.20240725.142901.tar"; + sha256 = "076a9gs6d298fvhk5sl2pf520pvknswcgbb6v7cwqhczcqj6wncm"; + }; + 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..01bca0ff1f8a1 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -0,0 +1,45 @@ +/* + # 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, 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; + + overrides = { }; + + in + super // overrides + ); + +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..1534ee9c4c3e9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -1,3693 +1,5591 @@ { 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, + 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.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar"; + sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y"; + }; + 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; + }; + } + ) { }; + 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.gnu.org/packages/beancount.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.15.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar"; + sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6"; + }; + 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.19.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar"; + sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99"; + }; + 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; + }; + } + ) { }; + csv2ledger = callPackage ( + { + csv-mode, + elpaBuild, + emacs, + 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 + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/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.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; + }; + } + ) { }; + dslide = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dslide.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.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar"; + sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk"; + }; + 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.31"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar"; + sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv"; + }; + 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.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar"; + sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk"; + }; + 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.9.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar"; + sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4"; + }; + 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, + 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.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.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar"; + sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck"; + }; + packageRequires = [ + async + emacs + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/helm-core.html"; + license = lib.licenses.free; + }; + } + ) { }; + hideshowvis = callPackage ( + { + elpaBuild, + emacs, + 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 = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hideshowvis.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 = "2.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar"; + sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3"; + }; + 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.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar"; + sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk"; + }; + 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.24"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar"; + sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023"; + }; + 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-transclusion-http = callPackage ( + { + elpaBuild, + emacs, + 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 = [ + emacs + org-transclusion + plz + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-transclusion-http.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.20240621.124732"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar"; + sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs"; + }; + 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 = "94.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar"; + sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3"; + }; + 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.14"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar"; + sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4"; + }; + 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.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar"; + sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23"; + }; + 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.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar"; + sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc"; + }; + 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.9.20240703220947"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar"; + sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya"; + }; + 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; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index beca93ea4c35f..cd32a8bd39754 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -20,12 +20,12 @@ 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; 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..bba5811c01df7 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 + 20240701, + 1407 ], "deps": [ "erlang", @@ -327,13 +327,13 @@ "maude-mode", "yasnippet" ], - "commit": "bf21971bf57100e9e1ac26563207b35b377ec057", - "sha256": "070xa0hylkxy2j8g5jhdv3q003aqvasp7ald6f98skg6a0hsrvc7" + "commit": "252d9f2de3773dcfc7b07f5edfafc2d9298c366e", + "sha256": "1z52wlv60y002xniy7klnp9aww8c4y6lkfif52h1v4l4q23czbhh" }, "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" } }, { @@ -2049,11 +2049,11 @@ "repo": "t4ccer/agenix.el", "unstable": { "version": [ - 20231016, - 614 + 20240601, + 1304 ], - "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", - "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", + "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x" }, "stable": { "version": [ @@ -2114,11 +2114,11 @@ "repo": "vietor/agtags", "unstable": { "version": [ - 20221026, - 904 + 20240701, + 1433 ], - "commit": "e8e04ece2f32d65b084974597bfe8077da3ddba0", - "sha256": "14sxysq606rq06banjhj5andny3j9r8yk3v4w8ipk0kd033qrr22" + "commit": "d47e58d024007d629b5a73c98c7c7e79f64be4d8", + "sha256": "13a9j56nnjh1zbglbd844wxr1zyw6jbdpmnmxcvhi9h5vksdxsgl" } }, { @@ -2254,14 +2254,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 +2590,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 +3261,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20240514, - 1944 + 20240710, + 536 ], - "commit": "32d81be1d8305c5ccde12c7d0b29845d4f831888", - "sha256": "1chlj0igxk2mmmdvmw3qahp3pz9ra6yabm4711xhlnx7zj028lkc" + "commit": "b14a6ccb2c3d0b06f2359ce44f8fe6fb535bf391", + "sha256": "180f6wb9whnzifpl3x9gcqfs94w04plyy99xk1nl5syx6ila6km3" } }, { @@ -3492,21 +3492,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": [ @@ -3870,11 +3870,11 @@ "repo": "Greybeard-Entertainment/app-monochrome", "unstable": { "version": [ - 20240406, - 36 + 20240611, + 1623 ], - "commit": "9324ec430a5154853c1da711e1c9738d61f1135a", - "sha256": "09jxb4b4lb19z2dfvpa0rjba89gcsphkx5d45p56rbb1b0i3h5iz" + "commit": "e319fcfeb56d0fe28bbda7fc813537593c2f368d", + "sha256": "0qgj8l22cyyxwknkwc0104nhi5kcswgx5amd1b67pmrxj6cni0ws" } }, { @@ -3885,11 +3885,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20240211, - 2243 + 20240703, + 221 ], - "commit": "05a67cba7508cf63bed22763a8949e55a7bf6786", - "sha256": "0644zfmrhlfrrgy5z21bp95885spcfxi93lv77gz070zzxk4ciq7" + "commit": "66136e99ad507e9b5404e09d01fe6e1828a930c7", + "sha256": "033sy23ybkv5y8194xi9693dwzmrpdxf4r1agy2rs6lkxssd1hb8" } }, { @@ -4105,11 +4105,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20210511, - 653 + 20240613, + 640 ], - "commit": "9ff2c47a3b56cbffd41a62376f7c2ff16ccbf4e0", - "sha256": "1vj649nrj7f7r7vmp97z1llbgl7sd8vlxvn30l8kdfrfkyf4gq3q" + "commit": "3265507b5fe4173b3f452a9519c3d09a777f35fb", + "sha256": "1xsd0y5m59701gz1xcy0n95c80ggz5q2rf0m4dbbncp2pcmwmnl1" } }, { @@ -4120,14 +4120,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" } }, { @@ -4461,11 +4461,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20240323, - 1912 + 20240712, + 457 ], - "commit": "72b70b004505db2f06318fefd6b358704b9167d7", - "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr" + "commit": "585231547a495d0a36bdf6db9ef50bb9a19119f3", + "sha256": "17mrj3bvh29r7bncsz47gbpwhr1j7d4scj97yb4c58d2a6zmwwcz" }, "stable": { "version": [ @@ -5097,20 +5097,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240415, - 1533 + 20240628, + 2027 ], - "commit": "01844064e3f2bb9f109a8a064998baf89a864fbc", - "sha256": "1syrwi1rb9w4y4fi8kckvd27i879w35y0sbmlhqpp2li0yx51wwa" + "commit": "8f6d708d7021559e0d4577f77b5d42afb3a6cb4f", + "sha256": "1dicy4srxlr07qj4sbwaa8bcdbhz91wnxh9zrk2w29z08m0f18c7" }, "stable": { "version": [ 2, 0, - 0 + 2 ], - "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", - "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" + "commit": "a495b3b92a555953b58ec4b6a8ab8411c337ea3d", + "sha256": "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl" } }, { @@ -5412,11 +5412,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20240322, - 44 + 20240711, + 2247 ], - "commit": "066f9723001647bec88b051e543b82366c9b7a42", - "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n" + "commit": "39b168e8e09b89ae8c8ef2388b895140901be48e", + "sha256": "1id8i9p6l46m1c09a7mz2335i168dj4q701d3a2q21i22lamhbff" } }, { @@ -5465,14 +5465,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 +6326,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 +6447,28 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240415, - 1533 + 20240712, + 2214 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f070ebb33eb44087e07ff647d8d87d1b27ce40d4", - "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng" + "commit": "39726634051b2c1ee8d661df894b130447fb7632", + "sha256": "07rk77zbjysdqkw2zh6rr3wf2mvqvcgkfjkplg1vyfqqvlsl5lwh" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f1d9e1cd5cba6362b152b5f4227d1714918fba59", - "sha256": "0f7rcbmaggj644z3j1pq2sjg4c12g9s2k4c5x3yrirjgazxfpr8x" + "commit": "af07e3862950c77bba6994ecbe9f62e0110dfc50", + "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng" } }, { @@ -6681,11 +6681,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20240421, - 101 + 20240621, + 2329 ], - "commit": "c7ea8116d331fd9ce913267489e7846c34795b38", - "sha256": "07vziyp5nn1rxgx0z467yjahvm90w5f62h5ysggrp924ywwzblp5" + "commit": "8789114e45d09d114e0e197cb090ce7beb993901", + "sha256": "1gipaykmrp20ncf6jlc1cl2w8swsg70iagzid4hj69cc3klay6mk" }, "stable": { "version": [ @@ -7779,26 +7779,26 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20240415, - 1533 + 20240712, + 2215 ], "deps": [ "compat" ], - "commit": "0ac08d9946f0da7066a6c2242025b42983c0c2e8", - "sha256": "1pp8m5ai7353jzm54laxg3l1c3xfsk32dlrg8wnpz6cgqkd47ajs" + "commit": "0b7ea156d211e8a87a931afa210d4f6beea20f5d", + "sha256": "0mmmxxi29jcngslfas309nv7hvkr94w3m0yb111663x28z24v523" }, "stable": { "version": [ 0, 4, - 6 + 7 ], "deps": [ "compat" ], - "commit": "dfc0c874d66d671cbb15149db27134e4ff4f54b8", - "sha256": "13aaz5fzdbplaf78713ax5f8v3qd7ggafdh1pgnc1mv4a37bjkl8" + "commit": "6244c479486b9a48369236b22a40d0830722e950", + "sha256": "1vildffmcj2k5q507ijn2s7f8x4fnabrq4gl2zrsx6ddddsbrym5" } }, { @@ -7966,14 +7966,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20230729, - 350 + 20240630, + 725 ], "deps": [ "seq" ], - "commit": "859d89c00e21c83565ed2b45f8d7527b45b1292c", - "sha256": "0da3wx93rbsy9y1hd5w722sgblg5bffznw00vyylwnq5zaikh5lp" + "commit": "a17eb5089bbab05372c018e67b3da9aa25217d81", + "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi" }, "stable": { "version": [ @@ -7984,7 +7984,7 @@ "deps": [ "seq" ], - "commit": "3cf7c254703f5c3a90c2cd617b522d09e7913c7b", + "commit": "9881ca21d30400681e0b3de404e5cc020e060209", "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m" } }, @@ -8020,14 +8020,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 +8142,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 +8313,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 +8876,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": [ @@ -8909,15 +8909,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20240415, - 1553 + 20240609, + 1435 ], "deps": [ "epkg", "magit" ], - "commit": "dfc5d58b439042a6e323cb342ab7531692d118a0", - "sha256": "02rq0ps327v8xlhs69r0cxicg4kljcza8ha7gks7z728hprwvhdl" + "commit": "940dc6af73cc40b5254fdb15ff1a6058e1b2b8a5", + "sha256": "1hlq3ss6waz6xi8qcqig1267l626fddpaz9038xy96w5zcm5wzdj" }, "stable": { "version": [ @@ -9069,11 +9069,11 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20231217, - 1203 + 20240623, + 126 ], - "commit": "23fd9db096ab3a5c5fbd034e721b8a7d27d1d6b7", - "sha256": "0nlwhk353fdl3jwmi1c6mz5898mh717lvldv9jypj9jdipcw6icc" + "commit": "b2a524b67d07483888fa17649a0618dfb6b22990", + "sha256": "1saq9fkdr4wflpnf257ddm3yhnvryhjms5isrik5vjwjv5j5lwrh" } }, { @@ -9141,11 +9141,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240507, - 504 + 20240620, + 1213 ], - "commit": "dafb49308796f75db802e2d23596dfd3fb7e37b0", - "sha256": "1fb20vhszf7la1skzy093m6kl3q3akicirbpdp0vhd3xs47jzk1h" + "commit": "942e042cc22224ec3940d0867c8c08f71e036924", + "sha256": "06ps4swqyf4b8pv3x51wqsnpkxp9dmq089rbyvhn4rp7rix8y8x7" } }, { @@ -9156,25 +9156,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 +9327,11 @@ "repo": "agzam/browser-hist.el", "unstable": { "version": [ - 20240402, - 2345 + 20240607, + 406 ], - "commit": "0b7e93274173e82c05e5d9c9d3055e4b9017612a", - "sha256": "0jsq1sk4vbs3r7lhz28a550w88qq0mj6y2ra5ry351dnxsypsmsn" + "commit": "0372c6d984ca194d9454b14eba6eadec480ec3ff", + "sha256": "0s19gglc9jwapy7a9mf4i97a7r5q9lpm2ivvn0zjhqxcmzj3295j" } }, { @@ -9357,14 +9357,14 @@ "repo": "plandes/bshell", "unstable": { "version": [ - 20230805, - 1646 + 20240112, + 2303 ], "deps": [ "buffer-manage" ], - "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e", - "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7" + "commit": "d59559cf7c5dded8b9639346ae5c1384d8b9be4e", + "sha256": "0shfv1lxhz5k07jppdn0shm0pv1lzwsncfyniwm15fwhvb71bzhv" }, "stable": { "version": [ @@ -10672,8 +10672,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20240507, - 456 + 20240707, + 1121 ], "deps": [ "dash", @@ -10683,13 +10683,13 @@ "s", "transient" ], - "commit": "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85", - "sha256": "0f3fqgl8kqb1r3dcfd9fn0sh68ky2l13mmd6hqib7lmg4lf7aljz" + "commit": "a12746cdd2605eba0ff88706473a04492dec84a2", + "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m" }, "stable": { "version": [ 2, - 12, + 13, 0 ], "deps": [ @@ -10700,8 +10700,8 @@ "s", "transient" ], - "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a", - "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0" + "commit": "a12746cdd2605eba0ff88706473a04492dec84a2", + "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m" } }, { @@ -10851,14 +10851,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240517, - 2216 + 20240710, + 1919 ], "deps": [ "compat" ], - "commit": "a71e5c96564163837810b96bd34322b42f6e4d9c", - "sha256": "0rwkn8p8p7axrh46x9cp3f90n5ic0dpm409pjn627s9sbz0j2vkj" + "commit": "040c1ee30b6ff766ba0f3e1458b43ce4a65f068b", + "sha256": "1h3xnjp1897syj2dwbb32x8s00hkcsvn09vsgjg1z204cd2i5czj" }, "stable": { "version": [ @@ -11212,27 +11212,65 @@ } }, { - "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 + 20240703, + 1846 ], - "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", - "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" + "deps": [ + "avy", + "casual-lib" + ], + "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9", + "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y" }, "stable": { "version": [ 1, - 5, + 4, + 0 + ], + "deps": [ + "avy", + "casual-lib" + ], + "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9", + "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y" + } + }, + { + "ename": "casual-calc", + "commit": "47f061be179f0c7f8b86faa99ff0d3e9d8552ac1", + "sha256": "1c0wk9zbh7rzi9s0jcdxnzxy989545ccz1xmj7cs9jw4dq0i63z6", + "fetcher": "github", + "repo": "kickingvegas/casual-calc", + "unstable": { + "version": [ + 20240628, + 2332 + ], + "deps": [ + "casual-lib" + ], + "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a", + "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw" + }, + "stable": { + "version": [ + 1, + 10, 0 ], - "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", - "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" + "deps": [ + "casual-lib" + ], + "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a", + "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw" } }, { @@ -11243,20 +11281,186 @@ "repo": "kickingvegas/casual-dired", "unstable": { "version": [ - 20240517, - 2348 + 20240710, + 2115 ], - "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", - "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + "deps": [ + "casual-lib" + ], + "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897", + "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq" }, "stable": { "version": [ 1, + 6, + 1 + ], + "deps": [ + "casual-lib" + ], + "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897", + "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq" + } + }, + { + "ename": "casual-ibuffer", + "commit": "de711e92fd2f8ff1c626c3f7f789f402e8e92007", + "sha256": "1gynvk22nhm8l7dix7hracr7m3y3d0h065mplkj78hpx2pkmhvja", + "fetcher": "github", + "repo": "kickingvegas/casual-ibuffer", + "unstable": { + "version": [ + 20240712, + 423 + ], + "deps": [ + "casual-lib" + ], + "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731", + "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq" + }, + "stable": { + "version": [ 1, - 2 + 1, + 1 + ], + "deps": [ + "casual-lib" + ], + "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731", + "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq" + } + }, + { + "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": [ + 20240711, + 403 + ], + "deps": [ + "casual-lib" + ], + "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e", + "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj" + }, + "stable": { + "version": [ + 1, + 8, + 1 + ], + "deps": [ + "casual-lib" + ], + "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e", + "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj" + } + }, + { + "ename": "casual-lib", + "commit": "fd3bb4b191bf416dd419c5c76d510c7f5890e673", + "sha256": "18g739n2dbcywamvkkpnrhsmmnk1l5b9v05d173b9qq1fj06pn8p", + "fetcher": "github", + "repo": "kickingvegas/casual-lib", + "unstable": { + "version": [ + 20240628, + 2300 + ], + "deps": [ + "transient" + ], + "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d", + "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "transient" ], - "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", - "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d", + "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf" + } + }, + { + "ename": "casual-suite", + "commit": "4294e2c5d538ee9e1f2a59ad0c32efcd7a6affd2", + "sha256": "1qbym111j4yjbkb87h31lnkx9c7jbzqgd9b2m2f9fkc1zj9ddkn9", + "fetcher": "github", + "repo": "kickingvegas/casual-suite", + "unstable": { + "version": [ + 20240705, + 1758 + ], + "deps": [ + "casual-avy", + "casual-calc", + "casual-dired", + "casual-ibuffer", + "casual-info", + "casual-isearch" + ], + "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956", + "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "casual-avy", + "casual-calc", + "casual-dired", + "casual-ibuffer", + "casual-info", + "casual-isearch" + ], + "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956", + "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi" } }, { @@ -11291,11 +11495,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20240326, - 900 + 20240607, + 1703 ], - "commit": "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994", - "sha256": "1j6nsy9is067288x2riabb7kc3grghb2g7bkvwndn2jyglbbxgi0" + "commit": "2f15c7c7cca7834b072bb26421a2755a67786899", + "sha256": "19gbkdmjq6616x9q4zhzf6hz9g1d91sh26h00pjzpbp1cj1qml3l" }, "stable": { "version": [ @@ -11382,30 +11586,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 +11780,14 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20240521, - 2204 + 20240704, + 1048 ], "deps": [ - "cl-lib", "powerline" ], - "commit": "3346b23545932c73c4c88a4cdb54778ecff95443", - "sha256": "1p2jllqv6d5xh1j06y9844msww56ldinnil8c1zd9jd4q6jsvnrz" + "commit": "12663a3ea01d2652d28e63a9644b68ac31c400be", + "sha256": "1jlwk3930i389f38mmkrzq5nwk1vfffczdcsc9i0si5rzr010zbs" }, "stable": { "version": [ @@ -11828,16 +12007,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240519, - 805 + 20240630, + 804 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "6ef789934d6b9b78cdbe5c90703f4afead736ead", - "sha256": "04hynyv60g9y3z76zlwvgfqmm4i9450skxhx0r8bw9m8yf04841i" + "commit": "a16c17e7765f1ae54ae7d40e748871e6b1ffced6", + "sha256": "1m1v2an9dpsksar9v60srg9bdhsiiwjxba7lbd7s6iyraj30r2dn" }, "stable": { "version": [ @@ -12101,14 +12280,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240517, - 2003 + 20240709, + 808 ], "deps": [ "shell-maker" ], - "commit": "910b0ad5cdb633f6be64f88596219a7eb58af226", - "sha256": "1mqdgsy1l9lc94cg1q8gzm7phc3f4rafk39cjlf5i9a1wai7f7p6" + "commit": "fce2b6d3609135f827da46dbb6d1f37d65a8b024", + "sha256": "1qlm6v2nbalfwwjwz956zmj9ipy2smfimlllidxdlbq0463hnsgs" } }, { @@ -12527,14 +12706,14 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20231205, - 26 + 20240618, + 626 ], "deps": [ "compat" ], - "commit": "a63fc0b7181299befc4496cba04e0f84d5953000", - "sha256": "0b2psymnp5bvx1ags4dx0xpm852bygrslk2qj4c8br5g89xh3pil" + "commit": "ea530813edb4936f36efea9b2f0009c9feb6b90b", + "sha256": "1rxqqarhspfvyf7ii0h6sg5z8qknn6zqj3cfy797awc2fv3m3drs" }, "stable": { "version": [ @@ -12711,11 +12890,11 @@ "repo": "DarkBuffalo/chronos", "unstable": { "version": [ - 20230804, - 1712 + 20240525, + 1339 ], - "commit": "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1", - "sha256": "009wc3hb2mflcpk0jdifvppjjj7m5gzgcf1s4x1knsrzqhmm9vxz" + "commit": "5ea0bf7c3881ea905e280446342539b242401979", + "sha256": "1175kx6nbkl6s8qdfjsd4vv4n0g2yd5wf8vbj31z8rk45fv4gnv2" } }, { @@ -12737,6 +12916,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 +12938,11 @@ "repo": "chyla/ChylaThemeForEmacs", "unstable": { "version": [ - 20231220, - 1545 + 20240708, + 2017 ], - "commit": "4d4b9dca3547e919ed5311cc7d04821f77860fbd", - "sha256": "1b41ar0ii5ikfi3hxss2maxgn2lx3kxzizpr9kf5218kmhjy3fh2" + "commit": "c2bb425eaff0975e0c7081f282d291f7853f8376", + "sha256": "0iqi0qfkwjhvqhs9yvs6pqbinp4jb6sj6fym4m69174fyqkjhc1b" } }, { @@ -12759,8 +12953,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240522, - 1030 + 20240711, + 1319 ], "deps": [ "clojure-mode", @@ -12771,13 +12965,13 @@ "spinner", "transient" ], - "commit": "5a477c58dca86cbee723ddb2d0670689f53c47ed", - "sha256": "075ikfwrn3n0czzlj2233y7d0ljal8hwzab1vqhfl100q61j0hrj" + "commit": "42608a1369760b6e36a86f0a63daa876c8b24e9e", + "sha256": "1rwsfcmxm1fy1lc0h9d511hhp3x17vhsxzmwizdzpfw42xpa1pyq" }, "stable": { "version": [ 1, - 13, + 15, 1 ], "deps": [ @@ -12789,8 +12983,8 @@ "spinner", "transient" ], - "commit": "06dc45844ad05fe23fccb7dec1609404e3cda88e", - "sha256": "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h" + "commit": "810337cee931d9f14aa16550a74516f8337a47f3", + "sha256": "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1" } }, { @@ -12969,20 +13163,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 +13187,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 +13299,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 +13397,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20240513, - 1309 + 20240621, + 1425 ], "deps": [ "compat", @@ -13216,8 +13410,8 @@ "s", "string-inflection" ], - "commit": "fed285385c1a8c0248890cd591f64a0e2598334d", - "sha256": "19m3q2izbgzvaimk9z38zznj1602vmr8y93c2sfrkyssjb4rmxfy" + "commit": "cfa30b6c95c7465a05da98eccf273608880b22d7", + "sha256": "0layhvngypfxms7ivhiqfhfx5787kq0vdp2m4k51mwgjk0cagfqc" }, "stable": { "version": [ @@ -13285,19 +13479,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 +13603,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 +13625,14 @@ "repo": "arminfriedl/claude-shell", "unstable": { "version": [ - 20240420, - 1917 + 20240707, + 1743 ], "deps": [ "shell-maker" ], - "commit": "2574f5d1fe58c44dc0e16d3a7be36a9e4e0927ca", - "sha256": "1my1n0bsx7xghaxa3qyrsqkdn3nxxym00acncp24b1hsm63k12yx" + "commit": "6fb330578a84a8753e32b9ffc50a2506406f1099", + "sha256": "1v6jbqd3djk4h3id4spqax6wzg1sgqc7mypci1j1qvgxafg6iqyh" } }, { @@ -14079,20 +14289,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 +14313,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 +14405,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20240314, - 552 + 20240618, + 301 ], - "commit": "8afa5656955814193b3b27020faf4edf00abda88", - "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr" + "commit": "7b7a4705d1a952b4414672955e67fb9471213f2a", + "sha256": "02hz3wfpfkkiqx92swmj5avisq408934iybip6rs4pwrh69630aq" }, "stable": { "version": [ @@ -14254,15 +14464,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20240415, - 1534 + 20240712, + 2215 ], "deps": [ "compat", "emacsql" ], - "commit": "2bff36edd28c9a0d0c25b545b3837fa874376cc5", - "sha256": "1951r5p5p6jr9xahjw7sr0s01d6mhcp721b35gxa9d9kw3p52xx6" + "commit": "ebfb860510d895ebcbbe920dd0d86381f1b6504c", + "sha256": "0v1maxvxzcihg1ssvxc1h1m4l0yzhfp9702s6fmb7h18yd2g2gvy" }, "stable": { "version": [ @@ -14447,20 +14657,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20240412, - 1329 + 20240624, + 1425 ], - "commit": "3bb04b05a527b2443298cb7bc9520f58e56c4e9e", - "sha256": "0cn206miz1z0b92rg95z7qr240awh92vfby62gjh9pv0mazhac3q" + "commit": "4b874546fc3711bb24fcdba5718e6c85a17c740a", + "sha256": "1mjw3wwn0bqqyvlf251mwbjq5pbw018qd6cnid5mjlxglfbj4y75" }, "stable": { "version": [ 3, - 29, - 3 + 30, + 0 ], - "commit": "b39fb31bf411c3925bd937f8cffbc471c2588c34", - "sha256": "1bwa80zrqyav0bxpq6b9vrjijbfn5g52vqhzvy70g7bp3jbp6vzm" + "commit": "0f88f57389fd636d76b7f726ac94933476d6c195", + "sha256": "1p6jq4yq81r0vdzr7wshllvn8dl80snz6q4ihp2fhd2yjngxj1l4" } }, { @@ -15046,14 +15256,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 +15282,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 +15624,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" } }, { @@ -15516,11 +15725,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240428, - 2258 + 20240713, + 303 ], - "commit": "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc", - "sha256": "19y5s4jxz62ak9q3cq66d1gijpbv9bkxazm4qyglsk9ayjz03q43" + "commit": "31f7ad52e4d353a8b2f0ec7e2c3135c012e500e2", + "sha256": "1xj4nghrdns30s8672566gpcbqz22wz6wkchq6g370s76ngmrqhs" }, "stable": { "version": [ @@ -16102,16 +16311,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": [ @@ -17551,8 +17760,8 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20240517, - 1816 + 20240617, + 2114 ], "deps": [ "eldoc", @@ -17560,21 +17769,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 +17820,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 +17921,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20231109, - 219 + 20240708, + 2135 ], "deps": [ "dash", @@ -17719,8 +17930,8 @@ "pythonic", "s" ], - "commit": "60e14d1e9793431b91913a5688e278bd91d56224", - "sha256": "1irrcdm3ckbafsjr442i9iljsfjqsg5mj79hzwps2k1j7b911gy1" + "commit": "ce748a53f9c7d7a7d112632d32c848d6e5482e18", + "sha256": "0l63dbkv91ashpjvnns4z5fzhmacal1pslycnmj05gar4sj4339v" }, "stable": { "version": [ @@ -17859,11 +18070,11 @@ "repo": "tralph3/conner", "unstable": { "version": [ - 20240512, - 1717 + 20240707, + 2220 ], - "commit": "d8dabaab32e39b01500841b7465076c6ad73c3b9", - "sha256": "1iw787gp2r7ab3xc8s6brsdc7a8cg5g2vsjlb1qhir6zmyz5y5dz" + "commit": "583d8288b07f4372b68e1c06917eb77c419c555d", + "sha256": "1ix3lrgdhc425kninmq9nly7472nzx9m925c3bpd8bf49pnd7ypk" }, "stable": { "version": [ @@ -17897,25 +18108,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240516, - 2240 + 20240710, + 2028 ], "deps": [ "compat" ], - "commit": "80407622f323669c735737272ecbc3b602434b77", - "sha256": "0rrxyds14a3c1f96q3hx92hm4axl66cgghrvc3j745s257macx0y" + "commit": "3d7f3d2de22eacb125f56ae5b5af6411bbe00b46", + "sha256": "1j6biflxz03ywqnvwiwhpk2x3gscb26q72sxcm8s8p4zkx5wrcwq" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "6eba1a3fa8e13681091a30b2490a03bdce5f243a", - "sha256": "1c6skqx5aqkb0mfnm5zw4mvzcrcr34zcd5jz3ypgb5483nv9kp3c" + "commit": "fe4852280006e61be7f1374d021ee06155ce5a26", + "sha256": "1xvxqv21b0d1c129dc72iajrbyyfibcv8gmv643h388p5wb69msv" } }, { @@ -18004,15 +18215,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": [ @@ -18266,14 +18477,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20230924, - 810 + 20240529, + 641 ], "deps": [ "consult" ], - "commit": "3ccd9d80da73a05ef2a74616ffdc469860f74c21", - "sha256": "1gxh0zwfkm50493bbnvjlsx38i3sxmrajqm1gf65icp55s0slrp0" + "commit": "b1ca94f7c43cbd3811d09a0c9ab04f67f6318e95", + "sha256": "1r8d42r4dszg7jdabgs60inn6hkd293fddps1sjrs8y4ygkxcp61" } }, { @@ -18317,16 +18528,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240516, - 1423 + 20240624, + 1219 ], "deps": [ "consult", "dash", "s" ], - "commit": "c97420c8e91aaae214be7de897eb7eb9b7843520", - "sha256": "0nf06al179p3g7n0zvcxkwhq1ygakg4n554a1w8f6k00m1syslsh" + "commit": "9858bb13b54934ea0a95df45947ff40ffde4553b", + "sha256": "0kv5hdc3cl7vkr06llyd6dcbddd55rmhhsfr8hzjpmvgw0h317kg" } }, { @@ -18567,20 +18778,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 +19078,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20240413, - 927 + 20240713, + 1327 ], "deps": [ "compat" ], - "commit": "b779552341354d59365a981fd208ae07b7a2950a", - "sha256": "0yhdp1bf96m0llfc8v19swnrd4zl2dn5gxyppvjyidjvic3n0djv" + "commit": "f74d3e7b5aa658663705035aaac2c321bb8ed5cc", + "sha256": "1xm04c98kj5qnnjb2kn4ckhsykbvzsgyzp44xh4kma1q76g1glxj" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "6088f0550dc8f10f5bcf6f24d35ce24159b01b43", - "sha256": "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas" + "commit": "cdc3e13ad312f5f12b3f78f842fff0b398eb4473", + "sha256": "04vsy5dv3zlid914igyi6ya9hf08ph0hc4c09pbja0z1if4mjrqh" } }, { @@ -19076,14 +19287,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 +20130,14 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20240109, - 557 + 20240619, + 731 ], "deps": [ "autothemer" ], - "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd", - "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb" + "commit": "10acf5c5d3e1108fc1e7a4ab487aa2ac79720f42", + "sha256": "0s07lvzrr12faxf5wpyg9s44g2v8w6vm4f59mam4xl6v8nq6pfdh" }, "stable": { "version": [ @@ -21076,11 +21287,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20240218, - 1753 + 20240529, + 611 ], - "commit": "dc583981dd2d4097ce1c9a80a958a7a1bf225ad4", - "sha256": "1vrv2iwglrv6xnpcrdgy9wwsixz2bcimn3ylh10gyv3rajym69fk" + "commit": "cbdabb9ca566cc12403f37f46d4102fe778e2721", + "sha256": "1rzmmc40cyg5z5jd8bns7fxb0pkiiiki4cg03wjq415mx7lli5n8" }, "stable": { "version": [ @@ -21100,11 +21311,11 @@ "repo": "andorsk/d2-mode", "unstable": { "version": [ - 20230210, - 1130 + 20240707, + 1850 ], - "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89", - "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v" + "commit": "69374e0249df20139f3f2d475de9eae2b201d019", + "sha256": "0hr2q2d3qfrbd7vpxbcamawvdzvak30rdsbrkxcqz9d36grhsj97" }, "stable": { "version": [ @@ -21334,8 +21545,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20240514, - 1617 + 20240611, + 1356 ], "deps": [ "bui", @@ -21348,8 +21559,8 @@ "posframe", "s" ], - "commit": "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583", - "sha256": "1m77dwy1p7jy41v7gjqk9w7jy6sh3blg2qrlw22f3y1d6n0h3lvs" + "commit": "b407773ebca56e3bd8e6a4643854e91cbde0c35e", + "sha256": "1a1iwx299xcm5ldd2sh7sjhmpb6wndyrwx7q0q6nih6j8ly0nppr" }, "stable": { "version": [ @@ -21709,11 +21920,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240407, - 12 + 20240529, + 2058 ], - "commit": "89b42bff4d60fb00ef3d679e2d2289541e5009f6", - "sha256": "1cl9p8a9dxjbl8kn7fqkx1abr90frk4g7n09lqriyf8hn5bizy5c" + "commit": "3852301f9c6f3104d9cc98389612b5ef3452a7de", + "sha256": "198xf1ydmgz795a7ffk9s5q4jszy6nrg1d54g1bacipwnq0c654v" }, "stable": { "version": [ @@ -22104,29 +22315,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 +22348,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20240519, - 1104 + 20240704, + 2138 ], - "commit": "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9", - "sha256": "0k3r9a9qsi380m4j53j4irfv591irg9w2i0pqk1c8fv3rwxrdiq5" + "commit": "8e41a9b4957b9d56ec6c55ee5d4ce84038d01dd6", + "sha256": "1k8w5h0n8imf7w2mnic68rkhb3mhp38nngwzssvmvfilnfb4bmiv" }, "stable": { "version": [ @@ -22367,10 +22578,10 @@ }, { "ename": "defcapture", - "commit": "96bb0339b35e5a7128889637bbd811eb5df1aa7d", - "sha256": "0gmvrpq8fyq6g85fl5078v9yyg5pjydnfl14aapgcsdd2iml97f6", + "commit": "1d636bef32d060df0e0da9dff699436bf949ed3b", + "sha256": "1hkbmhirlb1pbpavr61nxzw58a9pjvh0f93abbdf3sqs1lhybbbk", "fetcher": "github", - "repo": "aggu4/defcapture", + "repo": "sawyerkirbi/defcapture", "unstable": { "version": [ 20230909, @@ -22529,11 +22740,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20240407, - 149 + 20240524, + 1524 ], - "commit": "7f352747a2c4dfe40ba060ab42f47ae8a9ddab41", - "sha256": "048kzgqxild8ywclp659wyvpjiqi16kpbc91zh1r459gzmawcll3" + "commit": "b369d7225d86551882568788a23c5497b232509c", + "sha256": "0zqkapm01czz6syvh125f2fird2mbxmrcgbksz4qycdc89hlrl1k" }, "stable": { "version": [ @@ -22676,6 +22887,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 +22915,34 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240512, - 113 + 20240616, + 359 ], "deps": [ "dash", "denote" ], - "commit": "7073ef97758fbcf953557efa15da9226283ff6b0", - "sha256": "151ba0mhq61y2iwic5645rh4agklp1rg3618xcc7r76b4078fybs" + "commit": "242c4d79ee13e9aca4566b552d29c74026b1ff6d", + "sha256": "1lgk351d33h0inp9i0vmaz12i57f1l73yswlipd59mpjvdzg04fa" + } + }, + { + "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 +23403,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20240421, - 810 + 20240616, + 2345 ], - "commit": "9e5b61a82e04ffd0e81f88fcf159575618886d72", - "sha256": "1jwgw5ypl9iw6hy1yk4y34l8n5mxaw3zhk4bly7wxpyq4di0n9ik" + "commit": "0338970469375eadd3c0e492997aec2fcb06bb27", + "sha256": "1mjazx6zcskijijdrgm0iqdi2kii01q2j1b6ifwdzg8c9pr7swmq" } }, { @@ -23182,14 +23433,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240505, - 2110 + 20240702, + 2020 ], "deps": [ "cl-lib" ], - "commit": "11f3113e790526d5ee00f61f8e7cd0d01e323b2e", - "sha256": "1a6hqb0258kdskixcwacq41d7x71rlpwwapmbpd9ds8w6dj5vi40" + "commit": "a942b2383db0dc16df389611b84031c29d5c17ed", + "sha256": "1i4wgf0mb7c0w2i1zkapds6gbs2njr7ddpfh9g2a7yfjlpb9hyln" }, "stable": { "version": [ @@ -23212,11 +23463,11 @@ "repo": "ber-ro/diffed", "unstable": { "version": [ - 20230208, - 1546 + 20240618, + 2037 ], - "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078", - "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9" + "commit": "93251169a4fc8c07fdd5f3d32c89b4d3401d37a1", + "sha256": "1am6a4b7yvdr4v54zmanirqbqvsk3bzf4ghf1rpdab5jk3rdzzg9" } }, { @@ -23305,15 +23556,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240429, - 2057 + 20240528, + 1657 ], "deps": [ "compat", "magit" ], - "commit": "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa", - "sha256": "1z7q6rr3cnp6fpx0439hbk22g1kl84xa6k3pbxm4mph2cqw536jm" + "commit": "79753bfec7c32f44dc0d5ed57a8bc6b370392a87", + "sha256": "02rl4zrh871cck7gr0b7jgw2xzlx50lgldbdcx2vdmd3ljkq383h" } }, { @@ -23347,20 +23598,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20240515, - 1529 + 20240613, + 225 ], - "commit": "546adaccb1f90d6947c2c80c2fab4933f40bc274", - "sha256": "16a4x0zxrhs2c4k7v3qhinbxayx213mb8b84jrs21sq7whfad63d" + "commit": "1a02a4773d1380d8cab44f5e342a1e9bcc7276e8", + "sha256": "0x0927zfhxx25xplyifnq4qg76ahifk9m51dqqqyahnf9rpljrhl" }, "stable": { "version": [ 0, 9, - 13 + 14 ], - "commit": "a0f0756b132202fadf487d689d3c4312f480d2a7", - "sha256": "0i055f0kvm4ymq9a7ad4zg2kzw4gf60db0kcg5q8gmlsri7ppsl2" + "commit": "4e5d0b463468fcc4a54df1310360ba13b2bdff6a", + "sha256": "10ng3dxckgzanxl4p4yn6syabhkzpiq49c9czdbfqhmabr5ayb3m" } }, { @@ -23480,26 +23731,26 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20240415, - 1534 + 20240712, + 2215 ], "deps": [ "compat" ], - "commit": "54bd356cdac7bdae2bdff994b048f847374cec6c", - "sha256": "0hjs9nxw6hy7kvaw389n1k1rwqq22pvc3q5cbndnybpkbfpmrhjq" + "commit": "9d08ecf4f8b00e53093864a59b51f58e4fb6ae4b", + "sha256": "18mp2ls5fs1kjg6wd11gkyqn9x83hkzqzq1djjssbh65z5ln6qd9" }, "stable": { "version": [ 2, 0, - 5 + 6 ], "deps": [ "compat" ], - "commit": "9e7b4d47f2dc972ec16baa6bd56b016000790ff4", - "sha256": "1f7syxknpqxvrng1sa9a7ypwg7c4r5gsc3c88rm1p5mrak2xpcg9" + "commit": "bb57bf5367b48862864f0dea4287fa81d51a0d5e", + "sha256": "0li7s5ny3w75k1r11bsh5psc9d0a3r9ap909brcldrpnp567wvq6" } }, { @@ -23563,11 +23814,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20240327, - 210 + 20240612, + 52 ], - "commit": "c577a8ed289d1a2cf56845fb6b8c7b9c638d4bc8", - "sha256": "11858nlkvpwyzkn7za8c45amv185pklg3x9z0s4a25zkxjrswi7m" + "commit": "ba65fec96983ae471edbeee2b38c2107bee94f31", + "sha256": "0blnbr4prdm1bg9qvyh8h2bkzzqnzbijrqzsz1327b1agqjh6j7c" }, "stable": { "version": [ @@ -23759,15 +24010,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 +24029,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 +24171,8 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20221127, - 1247 + 20240629, + 1857 ], "deps": [ "cl-lib", @@ -23929,8 +24180,8 @@ "dired-hacks-utils", "f" ], - "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", - "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -23986,14 +24237,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1906 ], "deps": [ "dash" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "63b04d17936c98cb4ad7ce6bc3331cda8e30c55a", + "sha256": "187qgpfnfyw6qbif0hqw987inz6kbxmb2nx6431f9rjzzyz9q75r" } }, { @@ -24178,15 +24429,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 +24448,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" } }, { @@ -24275,15 +24549,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 +24568,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 +24702,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 +24756,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 +25080,11 @@ "repo": "purcell/disable-mouse", "unstable": { "version": [ - 20210512, - 2114 + 20240604, + 900 ], - "commit": "cae3be9dd012727b40ad3b511731191f79cebe42", - "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f" + "commit": "93a55a6453f34049375f97d3cf817b4e6db46f25", + "sha256": "0acqinbhb4vjyq4fhw2abslgkn6qwnvqbgzk6wbglff2m256vrdi" }, "stable": { "version": [ @@ -25466,11 +25741,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20240421, - 943 + 20240616, + 2345 ], - "commit": "d2bfa37f2f027c5da0abca319882daa3740ca57b", - "sha256": "0j70sg2gnf2qi367pskwbm24qvy8bl2qims04rjaw7knd9yiyh43" + "commit": "cc363ed39f023642c4d8e7c91b26c802ca356fa3", + "sha256": "02kh8wk202qppac7l7ap8hknb1hbg06gi66w5cpxhp32lijh1m90" } }, { @@ -25919,16 +26194,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240510, - 144 + 20240625, + 230 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "65d0bd83eb7c393092e032c24b882f3ba19b4899", - "sha256": "1w657ss91f00kb3gghi9rs0a8cw2bszvik4yjzn6cj7m8ji3k3qi" + "commit": "1505c13564b83e44d3187611e326a48b742cad3a", + "sha256": "1scq3ahqg6s7ccvd0gs0m2ifa8k9rzflaslz3lmp0i7kmv1prs49" }, "stable": { "version": [ @@ -25953,15 +26228,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 +26247,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20240404, - 2042 + 20240712, + 1822 ], "deps": [ "cl-lib" ], - "commit": "3b2422b208d28e8734b300cd3cc6a7f4af5eba55", - "sha256": "1ksv964vlzszbd2372kl80l60mmmiqxgyxypysrylrw831kkxfi9" + "commit": "2c794a09b023bda09d2f36a7be80684f4e416d88", + "sha256": "16mhcbnk8cv0lacl9wycbj1d1i2brrb3vf6lb4hxyici5qlfyykh" }, "stable": { "version": [ @@ -26199,11 +26474,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20240421, - 628 + 20240626, + 1953 ], - "commit": "acfc3bd42271286d22d7cbadd48a5b9d5675f85c", - "sha256": "1mhh6kmlkbzaliyx8fwdnbmkhaaing4jkjc9ai76l5nyisjimqrc" + "deps": [ + "debian-el" + ], + "commit": "dbebf6fc2c50facff195ae9fb14bf691ad0f4544", + "sha256": "0pj2sjj0dnv12m982icaqf93bnklaab4wg96bbyzhiji981yjs2x" }, "stable": { "version": [ @@ -26249,11 +26527,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20231013, - 821 + 20240614, + 1303 ], - "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2", - "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38" + "commit": "1dd3702bcca1191b082783062bde42668515c700", + "sha256": "0sxanisx51vcplnhgz7yn3xslslky4xp4ydjkrgwq045ppmq3rr7" }, "stable": { "version": [ @@ -26454,6 +26732,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 +26844,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20240211, - 1111 + 20240623, + 2118 ], - "commit": "5d1b44f9a1a484ca229cc14f8062609a10ef4891", - "sha256": "1k8d4a7hq21ahiad0mlpyi637r0b2mzjpxhz09c69h1nk38nkzjn" + "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c", + "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r" }, "stable": { "version": [ 1, - 17 + 18 ], - "commit": "e45fa760eecf74edfa9e8419f9f9773d8a7abadd", - "sha256": "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la" + "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c", + "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r" } }, { @@ -26624,16 +26926,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 +26984,11 @@ "stable": { "version": [ 3, - 15, - 2 + 16, + 0 ], - "commit": "c28817c416ac0b381f6a6938236419ab5d86d6e1", - "sha256": "0rgrfpw588mgw78p87xlrlidc9xhkppf6b7dqa3vqlhjxs5q6kqg" + "commit": "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed", + "sha256": "0sxz15g1lhgm880glix2y0dinsidpv83ss7cvb2ff12rbjhk4a4w" } }, { @@ -26804,11 +27106,11 @@ "repo": "sadiq/dwim-coder-mode", "unstable": { "version": [ - 20230830, - 1215 + 20240712, + 1047 ], - "commit": "94a752fca078144dd309343880abafbc4eacca5f", - "sha256": "010z2bcscizd75shmbgrjfvlkzsfjcvqcif7pm5a5iynmjx5n4n7" + "commit": "02f5fa0c3ae5cc17ca860c792d988705f41b0eee", + "sha256": "0p1yz2lnzifqsjqcbk2jk9darj72icnydaxwhs2h0hmvl786g4gi" } }, { @@ -26819,11 +27121,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240520, - 1732 + 20240712, + 859 ], - "commit": "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b", - "sha256": "0lj8rkvpns4fpdmwriax0i5yijqraji1vjbdc6scyvpmdmsqd3p1" + "commit": "715f0ae8cfe455f1dc611074bb8bb90e03533dab", + "sha256": "0gjz3sliwdxgsvd2c1chmqfzwzk1bbflb7qn8gc3ims1fwjhz0jc" } }, { @@ -26964,11 +27266,11 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20230619, - 1854 + 20240615, + 129 ], - "commit": "909a64aa96f09b05fe59d5703f7e0ad22d161bb5", - "sha256": "18vf0646wqnahnc7rj0wzq9shd1g69hr5j35psgcdzkrczma16m7" + "commit": "90daf413abee1723c37697e72bb700a06727ff4b", + "sha256": "12634kmx7fdb3lndyjgf7hisdzcqg3hn90xqr56gjdj0m5yzq310" }, "stable": { "version": [ @@ -27287,20 +27589,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 +27640,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240420, - 113 + 20240608, + 744 ], "deps": [ "ansi", @@ -27348,8 +27650,8 @@ "lv", "marquee-header" ], - "commit": "bde4a0af084f356b993b5fd5b727c05c54e1d132", - "sha256": "17cg70n50h1jpi2j705wpy4g3xgca8hqhraqinbk1lac9z2s3sil" + "commit": "d75ec4865742a4939bd685360f8ec5b076bdcf77", + "sha256": "10zqx7kfjw6rzq0mqpj4s3sdb13rabw98bkgm9nddi387ffmamql" }, "stable": { "version": [ @@ -27618,28 +27920,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240430, - 1436 + 20240618, + 1008 ], "deps": [ "compat", "parsebib" ], - "commit": "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba", - "sha256": "0x40cwcibl3dsyxmqn3yhsbw5pyisx5yypjy6qm7hzi6r2wxgvzr" + "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f", + "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k" }, "stable": { "version": [ 2, - 41, - 1 + 42, + 2 ], "deps": [ "compat", "parsebib" ], - "commit": "3458aa7777e0acf883b17008da78788c62d9a337", - "sha256": "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d" + "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f", + "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k" } }, { @@ -27731,11 +28033,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20240521, - 326 + 20240601, + 1744 ], - "commit": "0e221754cb40406609ae5c79ac294683850638e1", - "sha256": "0cwpphdj78g6w4an58qrf3mbqji0lm6cfzkz099pcppg17ljz4h4" + "commit": "80f5a8bbd8ac848d4a69796c9568b4a55958e974", + "sha256": "1mpq8ha42lffzzwy0ib8vbb2dp9fgqnh112wfa1a6b3vh21wnxm8" } }, { @@ -28193,14 +28495,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20240512, - 1958 + 20240604, + 602 ], "deps": [ "nadvice" ], - "commit": "6ac848e380322bb52d6f70a032e12f70d60daab1", - "sha256": "08fl3jg2vklyczqdz3ifaa0j4zkq7siz0m141lzcq5rahi7c65g6" + "commit": "0ce1abc65bfb030ccec97b0d4231667ca431e663", + "sha256": "1kxj0srq9f6ibhdd25428585h5v73xgdf5wq95qlz2r4vshmpxw0" }, "stable": { "version": [ @@ -28451,11 +28753,11 @@ "repo": "oxidase/eff", "unstable": { "version": [ - 20240108, - 658 + 20240708, + 231 ], - "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84", - "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8" + "commit": "b8298439360b29333d3dcd8a352e00cde2b6ccd7", + "sha256": "0s8k4nfr8m13c1ylsn401yhf17ym15lh950smv01lbymkghcxvkg" }, "stable": { "version": [ @@ -28727,22 +29029,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": [ @@ -29480,6 +29782,21 @@ } }, { + "ename": "elcute", + "commit": "53b72d7a58b48652ecb140cb4ddac93536522c01", + "sha256": "0dawqaaghaiz6mqvmcmmws5wlhx3h9x8bnbf9qam4pvzm4c29nz4", + "fetcher": "codeberg", + "repo": "vilij/slurpbarf-elcute", + "unstable": { + "version": [ + 20240708, + 1910 + ], + "commit": "625da6298f7128204de7464d6e2df298741f784f", + "sha256": "1g6gajikz1g9hni15r2sa206208q1v23d9yryrr7vrp8my1n72d4" + } + }, + { "ename": "eldev", "commit": "6d94da66938ea895c0b32bb54057c3b36bebf36d", "sha256": "11plii1q276ravzb3qi2h25rfadvx4j5l55lj7ldjar8rxvilhij", @@ -29487,11 +29804,11 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240511, - 2039 + 20240609, + 1211 ], - "commit": "5153b5a747aaadb51ac14f3963e3ffbf59273e74", - "sha256": "183pa9sxg0qg0kd75vgll7xfaplpkrlj077vdqhh5qcciikhqhla" + "commit": "bb1938237ee85e477243cd45421330403df29390", + "sha256": "01fmgafs294lns10nj31pj327v943x7r4y81plp43gm8cngzgf0r" }, "stable": { "version": [ @@ -29511,20 +29828,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" } }, { @@ -30046,26 +30363,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 +30425,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20240511, - 418 + 20240606, + 241 ], "deps": [ "aio", "elfeed" ], - "commit": "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c", - "sha256": "1c0nxzqhldn59hgalvx24r7wn0s641jv6akv8vra6m8qwarw9ksk" + "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2", + "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca" }, "stable": { "version": [ @@ -30280,30 +30597,32 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20240401, - 1528 + 20240712, + 1639 ], "deps": [ "async", "ellama", - "llm" + "llm", + "plz" ], - "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", - "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" + "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a", + "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5" }, "stable": { "version": [ - 0, 1, - 4 + 0, + 0 ], "deps": [ "async", "ellama", - "llm" + "llm", + "plz" ], - "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", - "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" + "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a", + "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5" } }, { @@ -30314,11 +30633,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20240421, - 854 + 20240616, + 2345 ], - "commit": "0560fe21d1173b2221fd8c600fab818f7eecbad4", - "sha256": "00vsgjqb3qfm2lr2vqf10yr84b07l63pgkqvi0s1a0js7mvv6s65" + "commit": "98edd8158b778ff9a0e34b5c6615523c0035f8d6", + "sha256": "11p41lpw0vvbwm3mshmhqmgqs39b9lmrba45im0hwfpa9wcmx73z" } }, { @@ -30628,28 +30947,30 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240517, - 1457 + 20240710, + 2027 ], "deps": [ + "compat", "llm", "spinner" ], - "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", - "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" + "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328", + "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby" }, "stable": { "version": [ 0, - 9, - 4 + 11, + 9 ], "deps": [ + "compat", "llm", "spinner" ], - "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", - "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" + "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328", + "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby" } }, { @@ -31009,11 +31330,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 +31712,28 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20240506, - 1556 + 20240712, + 2216 ], "deps": [ "compat", "llama" ], - "commit": "9db9f8dcc595717d82943fef66f554a4b40aff0b", - "sha256": "1cn4qya2miky1bwiwdkbp6kykcf5syy3hb7vfz5jlld4i9ckc23c" + "commit": "1159333ab9a09eaf32b3ab4fe10e4e7cea5a1a64", + "sha256": "1976vnpfpk4bz5pw7abh2624dwjwn0bfyf7fyb75djr4yg3g1bjy" }, "stable": { "version": [ 2, 0, - 0 + 2 ], "deps": [ "compat", "llama" ], - "commit": "f3dfcb41c6471b8150cc19cea5ff96fe1321f5a1", - "sha256": "1m01fmhxgqrk22llwwafyg3a29h5bhrbdv9mpf6yyqdm2f37h3yb" + "commit": "bb621713e2a111be5d2e3c45f4d168ccc8dd6fcd", + "sha256": "071x09yh7zaqpm3yphs6gn3lj1yxxzqlh5lf2rzykhnl6241pmv5" } }, { @@ -31438,20 +31759,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" } }, { @@ -31477,11 +31799,11 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 + 20240623, + 1340 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "efddd69c5e69214dbbe921fbf90f938501414894", + "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg" }, "stable": { "version": [ @@ -31593,14 +31915,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 + 20240623, + 1340 ], "deps": [ "emacsql" ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "efddd69c5e69214dbbe921fbf90f938501414894", + "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg" }, "stable": { "version": [ @@ -31756,14 +32078,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240419, - 452 + 20240607, + 2213 ], "deps": [ "compat" ], - "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", - "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" + "commit": "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013", + "sha256": "1l8jqvcn61a1lzclq77z82645f7qsq7i61f9rknwbdwxb9aaidij" }, "stable": { "version": [ @@ -31970,11 +32292,11 @@ "repo": "smihica/emmet-mode", "unstable": { "version": [ - 20221111, - 329 + 20240617, + 45 ], - "commit": "63b6932603184956b5ea8919036d2b307b48d7fd", - "sha256": "1g0fvp98w23dsyi75idyv4jf90635z80hchd1k13pychla6bw76j" + "commit": "322d3bb112fced57d63b44863357f7a0b7eee1e3", + "sha256": "1y41iqlybfls1rsagi9g1s879vw020r252j8m9jc89lsp5vkhawk" }, "stable": { "version": [ @@ -31994,28 +32316,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 +32728,28 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240517, - 1701 + 20240712, + 2241 ], "deps": [ "compat", "s" ], - "commit": "c7313288e350de7331779c0b37a8298980f6ff57", - "sha256": "00w59r7ycpv7819kbyjcvpiif9kzqh7k5nk1nfy2wgs1saxkg8ln" + "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e", + "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1" }, "stable": { "version": [ 4, - 1, + 4, 0 ], "deps": [ "compat", "s" ], - "commit": "c48cd223b145806a6a36167c299e9a0384a5f2e6", - "sha256": "0p62wfsxk0sh8lpjm52md8kaixkfagfsl9gpmps76448iznn04m7" + "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e", + "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1" } }, { @@ -32586,6 +32909,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 +33061,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" } }, { @@ -32852,8 +33204,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20240415, - 1554 + 20240712, + 2216 ], "deps": [ "closql", @@ -32861,8 +33213,8 @@ "emacsql", "llama" ], - "commit": "91c3e441eaa9f85b13d5957ee82f7c440addd147", - "sha256": "0n6psk9k2aglfsbxpnqfsmah4c9060sgf13wix0mmakba2iq11wc" + "commit": "e864055a1916a54127050fbb50f07614e2f6319b", + "sha256": "0d0y50dacjg6jwz1vn8hmacighn0q7g1h15pwh32gd9qakmp15z1" }, "stable": { "version": [ @@ -32885,8 +33237,8 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20240415, - 1536 + 20240712, + 2216 ], "deps": [ "compat", @@ -32894,8 +33246,8 @@ "llama", "marginalia" ], - "commit": "41bb627934e0a389e24573d2c9d088f6f6afdbcc", - "sha256": "1m0g1h81if11v0mw8l3kd6i2mxs1r1s1dh9c84niig0gw0dgligw" + "commit": "11e551187b7fa37aa8989bee50939ed0adbacdeb", + "sha256": "1mplkpm7h33g0y3p98kcywyrw6k0xvyrwjpy1xkiswlwknmvx51i" }, "stable": { "version": [ @@ -33108,11 +33460,11 @@ "repo": "leathekd/erc-hl-nicks", "unstable": { "version": [ - 20200317, - 16 + 20240615, + 2058 ], - "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439", - "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra" + "commit": "fd2759bde20c25226a332c3d19aed6c7f135bf10", + "sha256": "1lpsm3z3q89hfpay476m7n7p1m897j0sl6z5bnvgn6cqyvhl1d8a" }, "stable": { "version": [ @@ -33568,19 +33920,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 +34399,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 +34592,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20240509, - 241 + 20240701, + 502 ], - "commit": "1198fd658d317747eb606a50c7767fef579af324", - "sha256": "1j2qfaw2jrd9gpn7a0i0wd5hjqgzj3akgkayrw73bh285iz19fm6" + "commit": "26f49633308ea876b5850256e07622de34ad0bdd", + "sha256": "1p2lqx3rzfmn1lamnx9ns5mr0svjqamx7ah9342l30bmv87skz1h" }, "stable": { "version": [ @@ -35191,6 +35559,30 @@ } }, { + "ename": "evenok", + "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1", + "sha256": "03kvr25rd91hkrrymyhsv1j48hr06p1k6hrz0skfd4ns617ambd0", + "fetcher": "codeberg", + "repo": "mekeor/evenok", + "unstable": { + "version": [ + 20240627, + 2213 + ], + "commit": "0f3291547de570ce8f03326443bf65452e848fd7", + "sha256": "1gf611r3vaq03gf696c2ig7idvxz0k52nji9w08rcmg1qwbl09va" + }, + "stable": { + "version": [ + 0, + 11, + 1 + ], + "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc", + "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3" + } + }, + { "ename": "everlasting-scratch", "commit": "7d14ddda9729eec229a72a8827d0f0a5be779db7", "sha256": "0ikpp9cvi4xh2bqlza8p2bnw26mv0km33ywp0l3a6n35n1f068v6", @@ -35198,11 +35590,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20240430, - 1713 + 20240612, + 814 ], - "commit": "1837142ae14fdfd4d634434ceff966b348826259", - "sha256": "15509mjlk382yws41gb90xqn9g06agjpd6c8b8ps4ykmswm6ad5h" + "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890", + "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04" }, "stable": { "version": [ @@ -35221,15 +35613,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240521, - 954 + 20240712, + 2240 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed", - "sha256": "1nrvrb520wpphbhj1ck7jz2ks55yd7bkzycbjzbh534zax1nri93" + "commit": "fc993435bbb3c486bdf0666298e2204ec170880b", + "sha256": "09a7kl45sj1wxlz8abir2c4d8whmf4kcbv2baldqj80jbljfvpyd" }, "stable": { "version": [ @@ -35351,8 +35743,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20240308, - 751 + 20240529, + 1025 ], "deps": [ "dash", @@ -35360,8 +35752,8 @@ "paredit", "smartparens" ], - "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580", - "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw" + "commit": "6637717af0bdac55f97eef98433d53a10395cf77", + "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0" } }, { @@ -35422,15 +35814,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240417, - 1647 + 20240711, + 1239 ], "deps": [ "annalist", "evil" ], - "commit": "5886bab852dc9e31959e70384d535473e44504ad", - "sha256": "0dz9dkmxm4j2r2nilgxwgvsgbm531rrsiszzx480zrmqybdsziq6" + "commit": "28d64031ff58871828a0dec25ef437beb9371337", + "sha256": "0zm7mgcapkc6nhn531qxnv8wsr5zvhhpd966yfi5f6nwhj7yv10l" }, "stable": { "version": [ @@ -36024,15 +36416,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": [ @@ -37492,8 +37884,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20231007, - 1253 + 20240610, + 32 ], "deps": [ "a", @@ -37505,8 +37897,8 @@ "s", "transient" ], - "commit": "9d164a54fd7be933e6f65d4cc7112c99bd957b26", - "sha256": "1b73274krk38jb8znnp5q788jh66g3s8w8lslf79b34s586p8ih4" + "commit": "f9a287a4cd533fdbd3b0e645f425a7b9c469e6ab", + "sha256": "0lf6xa0x2g0izwfcpi48b0s0146mz8r60gf4ynqpx4fmyl2mccj5" } }, { @@ -38218,19 +38610,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 +39073,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20240311, - 1417 + 20240711, + 753 ], "deps": [ "markdown-mode" ], - "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad", - "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66" + "commit": "7c31f0d580bb20f70285bae136c6b4634a6c21b5", + "sha256": "0jxs8ic6z2rcv8l62614phf1hgq4zr4nmfm2bznbqf49kc5hpxhk" }, "stable": { "version": [ @@ -38913,15 +39305,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": [ @@ -39399,6 +39791,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", @@ -39945,11 +40352,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20240109, - 607 + 20240702, + 1515 ], - "commit": "9339a2a1a8052159916e9913b14ec062c0a3f506", - "sha256": "071if59ikrfyc17vw1fbzpqsg16zd7zpnfgxhi02sz8ng7q4jmx7" + "commit": "e9c352075eb3a0d06e280d60968b6147f9678b6e", + "sha256": "1g0n72j05s2k70a5d4plawrmffvinkc970pidysfjc7rpzfzrpgc" } }, { @@ -40261,11 +40668,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20240411, - 449 + 20240703, + 1352 ], - "commit": "900b8e79754d21853a6e5b5a2802f317a7112a1e", - "sha256": "0k9gf7aim1ns09rmicaqy93lp1915c8llr9i837gw8a86c8fjfrr" + "commit": "eb29cd8b4adb211226e2b87eac49b8d5fb169c55", + "sha256": "1rnn63vwy8fx3g578zlqipffr0w0zl43mmzz0bgdafr4mal4ac5x" }, "stable": { "version": [ @@ -40428,15 +40835,15 @@ "repo": "shuxiao9058/flycheck-buf-lint", "unstable": { "version": [ - 20230724, - 1501 + 20240612, + 1219 ], "deps": [ "flycheck", "s" ], - "commit": "51c439dcb9fa40966256d8cce835f7b7aabf44d0", - "sha256": "1gq8abj5ld2hqhwc0p7qmf8vfy8nj3pfzzdba2yh8zx8l22r2h3i" + "commit": "6cf7e7a01bfe150f9be45e83f9fc2d0c8b9d8de3", + "sha256": "1lf69gmbh0q9drjxb1h1wz426hxjr4mkzl8grz6ggl56rxwxj2f4" } }, { @@ -41087,15 +41494,15 @@ "repo": "flycheck/flycheck-eglot", "unstable": { "version": [ - 20240214, - 1937 + 20240705, + 1738 ], "deps": [ "eglot", "flycheck" ], - "commit": "a38101634c55ef6cfcfc74b4fd9a50b541b42457", - "sha256": "0r4h4c0pzfgp22iscgszvzv1sf3b286wrgmds0ijlha4r99ln88s" + "commit": "09e37f4c726d9b565b040ba9e89215158d3bd6b6", + "sha256": "0hxkgdgxlj4faylckbfj68pg0dxj5y8nfyq3rkqshswma1537zg1" } }, { @@ -41678,14 +42085,14 @@ "repo": "flycheck/flycheck-inline", "unstable": { "version": [ - 20200808, - 1019 + 20240709, + 1812 ], "deps": [ "flycheck" ], - "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", - "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" + "commit": "de96ba2eb4619a9a7d891773629ec70f2be89aec", + "sha256": "1nh28p3sf1swxgip732lh9k9bmw1k4x4z0pnjw8ihcas4xw0bygy" } }, { @@ -42231,15 +42638,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": [ @@ -43325,11 +43732,11 @@ "repo": "purcell/flymake-easy", "unstable": { "version": [ - 20141022, - 1828 + 20240624, + 1702 ], - "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392", - "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c" + "commit": "1986500f75ea06f006ab1734abcce441117d385d", + "sha256": "1pb2angvlfdg4s9qbsm6yzhshxpfz75p3dd50vw7cbb4q1iws8a0" }, "stable": { "version": [ @@ -43933,11 +44340,11 @@ "repo": "LionyxML/flymake-margin", "unstable": { "version": [ - 20240401, - 2342 + 20240612, + 306 ], - "commit": "fe4da9f947c7a11aba331dd77637d471cedbd061", - "sha256": "1p3q7s5n1szggj8w8fmpz8l7g27srmsrgla5wag2320dnd6djrir" + "commit": "4e36634789d64c33a9fc0dc5bc2eb4a21c391d96", + "sha256": "05fw8ncspafk4j2mvqaznw78cqwf2v1xdl70b7j30cya97wab4kn" } }, { @@ -44303,14 +44710,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20240419, - 232 + 20240709, + 1338 ], "deps": [ "project" ], - "commit": "15bf4d3a4ebe899991e385b64901b5cde0daa177", - "sha256": "0g9czaf6his577g1fcgi5xiy3fhfjkf8ihilgnxjydiwgr4fg4f1" + "commit": "3b69008d6cc3084338392bc03373d00844ad4261", + "sha256": "0yy16n5lqyv5bd2q3jlnmcg9hjx79985kf9ap283shx5ssb217zq" } }, { @@ -44412,11 +44819,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20231105, - 2009 + 20240611, + 1257 ], - "commit": "598dff268231f74ba902e2c607c85dd014fbee28", - "sha256": "0r32vhb9krjhq4xk0bmzk43x756jcw39k7vl0ps10zha7p7mnm69" + "commit": "0a836d7a919723ae5897fce01c3c7d651a30e8c6", + "sha256": "1i75c2i6ks2drq5a8y48m7wyk50jm5p7lj2xks3jwkzj4dgl7c4p" } }, { @@ -44834,14 +45241,14 @@ "repo": "larstvei/Focus", "unstable": { "version": [ - 20221016, - 1846 + 20240528, + 901 ], "deps": [ "cl-lib" ], - "commit": "2507ec4ec5a9402647ef85540669db1815520c15", - "sha256": "0qbzbs18isxyf5yiz64vyxvzjpfjdaafxnas2lhx3sjkgglb08i2" + "commit": "17c471544f540f2cf9a05fd6cd87e52e5de317e2", + "sha256": "0aqcnvnla4rmpc9iy679jaw1vqqg16j2fw7m9iis7j3w0wcw5c77" }, "stable": { "version": [ @@ -45236,8 +45643,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20240519, - 1510 + 20240712, + 1313 ], "deps": [ "closql", @@ -45252,8 +45659,8 @@ "transient", "yaml" ], - "commit": "d3b14f2cb6740d18827ed713715908b517e4a899", - "sha256": "058g4gi3p3r70h1bdpphbg65xwggq4azyw70wgq30b9q13v90lkh" + "commit": "03d012ae24eafa89a1a5ba7d9ed4069b05d54e21", + "sha256": "09pclclvw92i216m45m5hzw55vi3zszps1jkykyqc2vpl0zna0i8" }, "stable": { "version": [ @@ -45471,14 +45878,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240520, - 307 + 20240710, + 937 ], "deps": [ "seq" ], - "commit": "7e10f27dd5d9a5d18e08a5454321e961167dfbf7", - "sha256": "0z7lf948l4yn8znir2nca2bd38c6wqcgihf6cx603j1q7ipfxnwb" + "commit": "70967d12f59cef29b7d301c2ed51c32b4a11c7f1", + "sha256": "1216wfps6zm0rq2ghq8m7m3nrjqk2j4ky6k1fsqkj5d5lj25x2gx" }, "stable": { "version": [ @@ -45489,7 +45896,7 @@ "deps": [ "seq" ], - "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928", + "commit": "195fa8670456855b592e76fb495d03cc621ad647", "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn" } }, @@ -45655,26 +46062,26 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20240415, - 1537 + 20240712, + 2217 ], "deps": [ "compat" ], - "commit": "8bceac0988ea2e84452f87b96e0a9f669d717843", - "sha256": "1xw8cd8gaawggywpqkalzcjsvn6ns52v7bsp0jmbz113y6l8q689" + "commit": "23d550389ca978945300f5a1076d5c4f530d8d0e", + "sha256": "0563z8ahn4jlmfwrz391h340d69hmn4szkk41cy1v9nig0f7vp8k" }, "stable": { "version": [ 0, 2, - 6 + 8 ], "deps": [ "compat" ], - "commit": "f74d99be64dc7afa4bdea106c0597c1fa59b9a3d", - "sha256": "0qwffkpjh5zsj487yi5m5j5y7vxqc67pga5nj127nbg4rdmjs3ng" + "commit": "c60ef067f582f7dc7ebdfb8e1b544068f56e2bf1", + "sha256": "0pbxzn16hjvmf81hscq3d3jj07d1j4x7amg67j741fwddvzkm8wc" } }, { @@ -45799,11 +46206,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20220301, - 148 + 20240630, + 730 ], - "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5", - "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49" + "commit": "0d0b6c425769a602ab18d41927feb8c0e22e214b", + "sha256": "0zs0d7r14yzw7nihw5v24drwbv1pf8ldrgfackkdkhxh1x6laqqm" }, "stable": { "version": [ @@ -45811,7 +46218,7 @@ 2, 2 ], - "commit": "1f252a922612e0d6ee62a683b7cdab8956460f11", + "commit": "6891d3b7a85da13e6d5982ac6b9588473941ec98", "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g" } }, @@ -46159,14 +46566,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 +46726,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20240224, - 1641 + 20240607, + 2153 ], "deps": [ "flx" ], - "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439", - "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f" + "commit": "21f4ac6b971f61890d46308d7ac5db64c20228e6", + "sha256": "0skjr9pqjbr4am3cdq78frf5bckpv5761j0ppp0pg6pfbrcdbaa3" }, "stable": { "version": [ @@ -46461,26 +46868,26 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20240415, - 1537 + 20240712, + 2218 ], "deps": [ "compat" ], - "commit": "2214ad1094b0b4d466825521eefe39bba65634d0", - "sha256": "0cqxin5mnmkjzswh6vk46dhxyh6parxd74w4i2cd44ijrh6rx9yn" + "commit": "257659fc0bf0112d40f921717c57e558b25f91ea", + "sha256": "02b5kgnmadgnq8cpmrh1srxpzw30gxn52azy58g9p16jy0i0lnnf" }, "stable": { "version": [ 2, 0, - 0 + 1 ], "deps": [ "compat" ], - "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", - "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" + "commit": "a2569c7c986dcde2c859e390a0da5aeacf69db77", + "sha256": "0dql8nh79sh10fhxc2h3sypx6qvrg30j2x3ib3mw32qwgx33v8m2" } }, { @@ -46592,11 +46999,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20231202, - 1410 + 20240502, + 1456 ], - "commit": "03c24b19c270feca0d3fc9494698cf6d4c7f8152", - "sha256": "1g1w0z04qc6k61p9y7mfplqk83yi3pcabv3mr4kfq1pmny8l46sp" + "commit": "cf0fce18ed51aa6b66e672e3f5655faf4631d9cd", + "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y" }, "stable": { "version": [ @@ -46692,6 +47099,21 @@ } }, { + "ename": "gdb-x", + "commit": "563763f2ef13c67fef65d54df6a7370cfa07ab81", + "sha256": "1ilzb1gagis1jkwnr00xq2szvmbzv0a1k99n1gv4x2a9crn122ma", + "fetcher": "codeberg", + "repo": "shepherd/gdb-x", + "unstable": { + "version": [ + 20240617, + 1857 + ], + "commit": "367dbb31e1591ffb3f4b7630f2c8ddcc0692e133", + "sha256": "0x1i1lrs5szrmabakhm07d6hiywn072b0bid0ir2jva4msqkcajp" + } + }, + { "ename": "gdscript-mode", "commit": "0694d21374661c7ff94202468d57ddd438c0973d", "sha256": "0jisqiyxdii1kl0kji0gj50ymviq0d7f2xqgjkh08ygdajvpz6cq", @@ -46800,25 +47222,25 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20240208, - 26 + 20240706, + 1537 ], "deps": [ "project" ], - "commit": "4e64934bd2ae7c6f0e4acb9f2ed017844c187223", - "sha256": "098xbywraa8a8qcg07iy2svvsqr10s9wdk2ixwcxdh0cskfq40m4" + "commit": "a81969a5271f155d2d1e389ccbe47e1c7ec36ae7", + "sha256": "17srwjw84lxpcfdl0jg7pxh6vdh3am6fs5dk0l4hy3z1axzd3i12" }, "stable": { "version": [ 0, - 30 + 31 ], "deps": [ "project" ], - "commit": "f343592a52da0f947989d07c208a51ad6c972a5e", - "sha256": "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938" + "commit": "b6b4ac070d136345345c80ff649f0084e3c512a5", + "sha256": "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5" } }, { @@ -46972,15 +47394,15 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20240314, - 1950 + 20240712, + 1202 ], "deps": [ "geiser", "transient" ], - "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd", - "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5" + "commit": "ebdd1923b0780778706ea6b16aa2b0ce3e7dc33d", + "sha256": "1fhv3r93vq497rkbwrfn6nwq525vviqlfbry6x2fimcm02sizsa1" }, "stable": { "version": [ @@ -47617,16 +48039,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20240507, - 1647 + 20240618, + 1527 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9", - "sha256": "1ag8jkc9kkq6rikz19gv2m2hj85f37zwdxxnx16825hf1q9xcjpk" + "commit": "e44aceeb12831f8b7afac4e089525b5a2dd5a5e8", + "sha256": "18k7w0fw56ris6wkf48dp5x4isq11zxzy712grdgax6gp0ls8m84" }, "stable": { "version": [ @@ -48041,16 +48463,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240520, - 1135 + 20240623, + 1335 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "22fd8f8594202a0679ccc2f7d02bca44d48b8039", - "sha256": "1ddx82j2j8sf9w7vc9jqa8fm54slprz4jyg3bxmsh6qb0y7n3yni" + "commit": "196abe727054a440bf6262c5c254ad4565cbaa66", + "sha256": "09hrg76rhjzz1y5svzbcbw2qpq6hxcq0rc4iasb0bqmvljcra0aq" }, "stable": { "version": [ @@ -48104,6 +48526,21 @@ } }, { + "ename": "git-commit-ts-mode", + "commit": "18b52cd5af8b5ccd5c28efcde18758d03e4c76dd", + "sha256": "0vp7r70j8sn5q8n30lhqjdhbk6kl2qrly1dq4a8vl5rfxs5rx81c", + "fetcher": "github", + "repo": "danilshvalov/git-commit-ts-mode", + "unstable": { + "version": [ + 20240527, + 708 + ], + "commit": "04219fdac2a5c1816cd08141513770adc0c2a48b", + "sha256": "0chhls16pz215hxsh2c9c95msz4jmj941fvpiqp57alsv7fva9ci" + } + }, + { "ename": "git-dwim", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", "sha256": "0xcigah06ak5wdma4ddcix58q2v5hszncb65f272m4lc2racgsfl", @@ -48137,6 +48574,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 +48805,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20240413, - 1547 + 20240630, + 626 ], - "commit": "f16ced38f954f1159fda2f0ba7b60842f8d7e9f9", - "sha256": "08miy2jdn5bbmwpz5p3a196p60j8ldgb4sk77rf1cz24dp490h1i" + "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8", + "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", - "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" + "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8", + "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z" } }, { @@ -48387,26 +48858,26 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20240415, - 1538 + 20240618, + 1609 ], "deps": [ "compat" ], - "commit": "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11", - "sha256": "1nf9ij8qab4lfcgj6h63mxlqph04z4icq5fxs5hsdxzcxrz3y6g1" + "commit": "7901415b39bef1b789d161ca2c10dfb910d13780", + "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i" }, "stable": { "version": [ 1, 4, - 2 + 3 ], "deps": [ "compat" ], - "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf", - "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc" + "commit": "7901415b39bef1b789d161ca2c10dfb910d13780", + "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i" } }, { @@ -48766,10 +49237,10 @@ }, { "ename": "github-modern-theme", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "07xv4psw34mrpb1f5fsvj8vcm9k3xlm43zxr6qmj00p46b35z25r", + "commit": "0ee692a25ee31066d22cd1cbe3405ec6c323e72e", + "sha256": "1i4589cwf5m7bf1x39mljsi0qjiwva8zpx14i03xbpnmc6h8x3nk", "fetcher": "github", - "repo": "philiparvidsson/GitHub-Modern-Theme-for-Emacs", + "repo": "vexx9/GitHub-Modern-Theme-for-Emacs", "unstable": { "version": [ 20171109, @@ -48896,10 +49367,10 @@ }, { "ename": "github-theme", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "132jahd8vvhzhhkm71dzq6x46wmaakbbxg9s7r9779bfwbrms9j9", + "commit": "41c3ba590a2bb7c864b7f86abf0bf8e82b157f1d", + "sha256": "0r22rhhv3qjvd9la0p13hpdk9ar9cblib4m8s8hax0lxqwr0h0gx", "fetcher": "github", - "repo": "philiparvidsson/GitHub-Theme-for-Emacs", + "repo": "vexx9/GitHub-Theme-for-Emacs", "unstable": { "version": [ 20170630, @@ -49502,28 +49973,28 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240517, - 334 + 20240712, + 1936 ], "deps": [ "compat", "emacsql" ], - "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", - "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" + "commit": "9f678e624d7e89478d0090826f813d05bb811e27", + "sha256": "0xlv6vp51gkd2i2xnhajkzhraz0nb8ykynbm8g9kjn8nq5y8dqmp" }, "stable": { "version": [ 0, - 2, - 5 + 3, + 0 ], "deps": [ "compat", "emacsql" ], - "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", - "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" + "commit": "688dc187a1684fabb209d4d08a2d2baa5ae0e99d", + "sha256": "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6" } }, { @@ -50188,11 +50659,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20230823, - 2304 + 20240620, + 1948 ], - "commit": "8dce1e3ba1cdc34a856ad53c8421413cfe33660e", - "sha256": "0l002gcjmwrfkc4972hc8sal6xaja05s50rg7cbv2q9axb18rcqj" + "commit": "636d36e37a0d2b6adb2e12d802ff4794ccbba336", + "sha256": "0n8qx85ijrijq8wdmmlga69v47vq0kw0njjkvmvibv05hi8g2q2h" }, "stable": { "version": [ @@ -50429,11 +50900,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20240522, - 333 + 20240711, + 28 ], - "commit": "8cc1f9d013fd99d5bec8b862f8acb249c9104e7e", - "sha256": "15z86y5dvwdcds6w6vl1bv6j4rakc5a4gzawbacpb8wz25nbbigx" + "commit": "97468ed8ff5ae93e01e93d4018e7be1b711046a1", + "sha256": "0c6snl8jm9ykpq2h3cl7335pmzycq9kg6ki3mqq8yzzrp51a6ffh" }, "stable": { "version": [ @@ -51057,8 +51528,8 @@ "stable": { "version": [ 0, - 37, - 2 + 38, + 0 ], "deps": [ "dash", @@ -51066,8 +51537,8 @@ "magit-popup", "s" ], - "commit": "9a1b3c8fdfd0fcbe460b3546ef1fba26905e6bd0", - "sha256": "1bcakhih2c3ql2npq4v8bsq88dknbk8658b94hbfhy16an81l2zn" + "commit": "51648874c24e2232274693e92218551e3292c425", + "sha256": "1bk2bnxc5b7y2ng0pdxnxfwr6s3yp4kpw50zwrak3phiv8z862k7" } }, { @@ -51221,28 +51692,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240520, - 1943 + 20240626, + 2246 ], "deps": [ "compat", "transient" ], - "commit": "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b", - "sha256": "1v6pvla6kv9ym3vkd37k2hkn71ycgh4av933ipjqycy1zrwb968i" + "commit": "dcc4e3640ebaa0f94e24b3ad2099a01f7f3a517a", + "sha256": "00y8kmzgsyqgvy0hcjinnqnm6jsf22wyg7jfadybwbnw9aiy7q6a" }, "stable": { "version": [ 0, - 8, - 6 + 9, + 0 ], "deps": [ "compat", "transient" ], - "commit": "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78", - "sha256": "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv" + "commit": "4c0583b2bd6557a09d66dfec84bab776242d0848", + "sha256": "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4" } }, { @@ -51253,11 +51724,11 @@ "repo": "mkcms/gpx-mode", "unstable": { "version": [ - 20240513, - 1737 + 20240609, + 2200 ], - "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8", - "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj" + "commit": "88aa5fed1b0987d90f442eb002ab0f2e4731e223", + "sha256": "1gc52avqkwq9l119ckah0qvwml6cc3w02gvl772ncj821ci90d7r" }, "stable": { "version": [ @@ -51709,6 +52180,25 @@ } }, { + "ename": "greader", + "commit": "adeadbbb9d48e015f621a86bd4fbfb26465ff5e6", + "sha256": "1z3qqbbaydfpmzwm5ih9b3grf1xwjaxh5s565lbd8r9kmfvb08zp", + "fetcher": "gitlab", + "repo": "michelangelo-rodriguez/greader", + "unstable": { + "version": [ + 20240712, + 2322 + ], + "deps": [ + "compat", + "seq" + ], + "commit": "7301a27f22bcae3e57a85e1e88d7917077b4d791", + "sha256": "0zxjkihz5x8jwpyxfykmkp5zna1m9p3kg9bir5h5k7aak07jj7mf" + } + }, + { "ename": "greek-polytonic", "commit": "bf0e6206be0e6f416c59323cf10bf052882863f3", "sha256": "0rp5iwiznp95r8srxvq72hna2hgcqj4q1dvg2ma86cqzgqwr4xnw", @@ -52047,14 +52537,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 +52726,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 +52845,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20240304, - 525 + 20240628, + 2142 ], - "commit": "223d19ffbd6296864a775d18025150ccbcbc7800", - "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85" + "commit": "569ee770d022df9f6d51ff448652788a379c377c", + "sha256": "1gl0w48gpqd02zq3jh4gn2n41mr8g850fq6s10jlmkdh6q1za233" } }, { @@ -52491,14 +52981,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20220215, - 1758 + 20240601, + 2029 ], "deps": [ "org" ], - "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327", - "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac" + "commit": "b884301058c075e6f530f10e970b744aa29f5937", + "sha256": "1jfizwqi54bw0w9p77wrz9b2a5jbyd2v14nrb1nr03l5jxmx0f1n" } }, { @@ -52509,14 +52999,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20230227, - 1950 + 20240524, + 1838 ], "deps": [ "s" ], - "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f", - "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm" + "commit": "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c", + "sha256": "0jnxys3zcmswb0z4zcd05c58cpw9qbw8hgwfqfsixyk720722b9g" }, "stable": { "version": [ @@ -52767,27 +53257,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 +53566,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20240116, - 1718 + 20240527, + 853 ], - "commit": "43b4036bf02b02de75643a1a2a31e28efac1c50b", - "sha256": "09lz6w8rwfvp57byzalz8l3622kb06inqf5p6ijngkrildfgzgcr" + "commit": "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0", + "sha256": "0r0fzvrmqg4vi4q9h3b260dppxszq4gpak5jl8kqb84s22hx4g33" }, "stable": { "version": [ @@ -53403,30 +53893,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240521, - 1457 + 20240710, + 509 ], "deps": [ "helm-core", - "popup", "wfnames" ], - "commit": "c65a9039b6574183aa3f3e0b647c85470c002339", - "sha256": "0m0b6gb393q60cha19wm0xsry6rihqyp2v6yqcrbmhjr4qbsmni6" + "commit": "568f104747876a675aad5f2ded395f487a5e6492", + "sha256": "1kgkvx6ys43awv6vryr6k0n8z70svn5i3pdx0lcwzc51sysy3zil" }, "stable": { "version": [ 3, 9, - 8 + 9 ], "deps": [ "helm-core", - "popup", "wfnames" ], - "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", - "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" + "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", + "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" } }, { @@ -54296,26 +54784,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240518, - 1434 + 20240712, + 1822 ], "deps": [ "async" ], - "commit": "ba2eb552353635222f14984b8a2f4456b4ac62e2", - "sha256": "15nb9dd59fbzmq2b78pnb9iy1d2q6bdnq6xxsmpycqr10kbmsv1p" + "commit": "0b3a41934051ae9be4b97f92115c121f9fb0352a", + "sha256": "0w0h8j4m6prxyhqznprwnzdqlqfqmcpvry2f6cb4fx2c4rxvv5sn" }, "stable": { "version": [ 3, 9, - 8 + 9 ], "deps": [ "async" ], - "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", - "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" + "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", + "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" } }, { @@ -55852,14 +56340,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20240315, - 1721 + 20240702, + 811 ], "deps": [ "helm" ], - "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b", - "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4" + "commit": "1cf4e5caf8f18ae323764015496b13d0e85c716f", + "sha256": "1nixr1si7zgrdpprxr3wrm89fl4g8dnnaq21wr217f9wf3gp7nkr" }, "stable": { "version": [ @@ -56321,23 +56809,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 +56834,8 @@ "org-ql", "s" ], - "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", - "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" + "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", + "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" } }, { @@ -58087,8 +58576,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20231028, - 516 + 20240613, + 1523 ], "deps": [ "dash", @@ -58096,8 +58585,8 @@ "f", "s" ], - "commit": "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69", - "sha256": "1shv5v0rls38znv64g8h80541qyjqk39fpr7wkq5vis8xpfvvpp5" + "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c", + "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx" }, "stable": { "version": [ @@ -59226,26 +59715,26 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20240415, - 1538 + 20240707, + 1351 ], "deps": [ "compat" ], - "commit": "36b66cde5777943ca0f190ad7a33fae3b2f6a404", - "sha256": "0v9mrkqxbvjpx1ynx8pja5djghwnix80vkbazrfv39j7shmx2dkh" + "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d", + "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0" }, "stable": { "version": [ 3, - 6, + 8, 0 ], "deps": [ "compat" ], - "commit": "70ce48470c85f1441de2c9428a240c3287995846", - "sha256": "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq" + "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d", + "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0" } }, { @@ -59796,11 +60285,11 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20240422, - 1351 + 20240527, + 1456 ], - "commit": "54ac89c5edc7a83344cf51d8be08e1e701f88863", - "sha256": "0sw9jc860fhlljq9s61qz6cgg2cf43zi2l0ff6mp4np5rdiyrwjd" + "commit": "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75", + "sha256": "19q4m3bc7dljh04662vm4rr1kz5c11rwyyv27vp01yakwbfig772" }, "stable": { "version": [ @@ -59946,11 +60435,11 @@ "repo": "pnor/huecycle", "unstable": { "version": [ - 20210830, - 340 + 20240614, + 49 ], - "commit": "a05e32351dcff3e61b5f15800556adfe1939c112", - "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r" + "commit": "8f3e8641f950072ebf4bb03afd49b87aad147ad9", + "sha256": "0v5d96sgfmglm4q2gi676ardkigdqws5k5cwcg8bk72cc2b35di1" }, "stable": { "version": [ @@ -60247,11 +60736,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20240519, - 1800 + 20240713, + 827 ], - "commit": "61937530ea3713b37ed34b8ad62331a507ccf8c6", - "sha256": "0i6h8m04njp9vwzibm2ja299lrgygw222mgknf773dys3bdnf7pm" + "commit": "e0504916079e982025ca3d260f53dba2ef122679", + "sha256": "10r5dhlq3djw1xiz1i21h5a1va5p0wc2q8rbxl9phcgvkph6mmij" } }, { @@ -60262,19 +60751,20 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240522, - 627 + 20240713, + 434 ], "deps": [ "compat", "map", + "org", "persist", "plz", "taxy-magit-section", "transient" ], - "commit": "f32525eea6032d3422a4419fe65d6c32eb359b8b", - "sha256": "0rs5ij0z82f2aiq5lrr0rkp33cxx2wb149mb2mrjczwrqm9riwbn" + "commit": "5afca563c757a7c3ced908f9193beee0cc0b013c", + "sha256": "1asaky1r47p1brybjjlcrf6lnwrhxc13m43xq9y08d10r1fvx4ch" }, "stable": { "version": [ @@ -60370,6 +60860,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", @@ -60455,11 +60969,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20240326, - 1233 + 20240531, + 2023 ], - "commit": "764aea597b8c9292da2d91294bb6a70e7ad7d6d7", - "sha256": "1hdkkrcs86xmw6j5z7bqqvk4kdsf4a8ksr9bfzwkfs8sc68314zv" + "commit": "96043dff1c542d15cccf5df46b778927fcf5680d", + "sha256": "1c9qpygvs5zqrsc2q0sdm6s3yz4qgwa6qin7vax13b1f654hz6mb" }, "stable": { "version": [ @@ -61268,15 +61782,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 +61892,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 +62068,26 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20240415, - 1539 + 20240618, + 1725 ], "deps": [ "compat" ], - "commit": "55c86a15fb253c7e351d55e762ece0a15dc816b9", - "sha256": "1svvjgp7ndn4i9rrg5idrqinhpfnmw0m5s5f4nr3c0zp44l2xn4i" + "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d", + "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "compat" ], - "commit": "96ac809dbe9cae0e620bb5b1d5d1fb391f3f4741", - "sha256": "0xxh1jci3gvbiv0kcif1b39gfakgwaqd7a8pfwpw7f7prv44ifp6" + "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d", + "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz" } }, { @@ -61860,14 +62374,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 +62494,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20230111, - 2012 + 20240524, + 847 ], - "commit": "936575500f733c2428ba878f9400f3eef8c9645e", - "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3" + "commit": "c0d7b5b0950fd8113f55a02b3ee7e0fc9c431bea", + "sha256": "0iydxmv5kawizfi0ibzlz38ycnacgskj6l1mrx47a2hxd5laz71i" }, "stable": { "version": [ @@ -62313,11 +62827,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240509, - 143 + 20240627, + 2135 ], - "commit": "1dcaa0aad2eec23582263f934005140ddf70f52c", - "sha256": "1rxxn0329c3xvcn931rwb2chfzxm2m9zi2zq6kvgi5bwq2p5b53q" + "commit": "b234625c85a48cc71e7045f5d48f079f410d576a", + "sha256": "13x6jg89wg0s41p12srv61if9jwz1j0j0q5yfc543lx6ndk1w67g" }, "stable": { "version": [ @@ -62749,10 +63263,10 @@ "repo": "ideasman42/emacs-theme-inkpot", "unstable": { "version": [ - 20230618, - 715 + 20240610, + 1406 ], - "commit": "2f59c524e17f8fb157bdbae5cf10cfe42f63c6bd", + "commit": "259272084f8ead2453f83f526ed95061f879d464", "sha256": "08lnbvnn56hkm78sxs7k5h8wy4v0c2aynq41bqjr3p2j19hkxssr" } }, @@ -63157,6 +63671,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", @@ -63743,11 +64280,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240519, - 1636 + 20240524, + 1139 ], - "commit": "6a98b006f140b588490c24c5f794aac4250bf300", - "sha256": "054wjara59jjqrhr7hq0h4h3f3k6gvbx6m8066s5hryvi1ij2p4y" + "commit": "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747", + "sha256": "1z5975q7a67z2kgnx3klr35magrcgy6idhzhi73in133cff0d21n" }, "stable": { "version": [ @@ -64659,11 +65196,11 @@ "repo": "zellio/j-mode", "unstable": { "version": [ - 20171224, - 1856 + 20240611, + 2211 ], - "commit": "e8725ac8af95498faabb2ca3ab3bd809a8f148e6", - "sha256": "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd" + "commit": "3f852d1476be5625fea51dcaaad66dd57593101a", + "sha256": "05biqy3gdq3k5yldjwpnsn9jabnchmdzcfkpkmcdr3j2dsh7rciw" }, "stable": { "version": [ @@ -64683,15 +65220,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20240522, - 1532 + 20240624, + 528 ], "deps": [ "fsm", "srv" ], - "commit": "02372a6673372779571b524319e08b84241e87c6", - "sha256": "0ps998w5z0qs676l29ag47mrrsg9k2g7pgl7fbfc0crbi2ivzj2a" + "commit": "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2", + "sha256": "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn" } }, { @@ -65480,25 +66017,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240515, - 1016 + 20240708, + 2122 ], "deps": [ "compat" ], - "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", - "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" + "commit": "e39f2682ea902a1d06bd118d5899b2bbadfb6dce", + "sha256": "0cy2qsgcg4xbivr5qz573xz00mp34igw5kv01h81n98a17cafga4" }, "stable": { "version": [ 1, - 7 + 9 ], "deps": [ "compat" ], - "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", - "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" + "commit": "4580aad8a0267bf30c98d210b6bdc1a08b1aad75", + "sha256": "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8" } }, { @@ -65589,11 +66126,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20240422, - 105 + 20240616, + 2345 ], - "commit": "8f517230266faf1decb8e948110baef7539c9df3", - "sha256": "0n78ijl1z1rlyx8y83c71rhwf63lzicc39d05myj25r31may5k2l" + "commit": "caf256543cfe5404333f5cf914a478d14b2ec102", + "sha256": "1iiinybr3alh0afmyhb2mz7c1r3c360bxy7x6ha2jhjk8ncz946c" } }, { @@ -65634,11 +66171,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20240508, - 951 + 20240617, + 1034 ], - "commit": "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3", - "sha256": "11ka3hcfzh7dzk37zb7lblyq6r5k2f4dpn8c1nkiyzamchbfg4df" + "commit": "278db38c30bd556793c9ce0c939045e95dbb6f32", + "sha256": "1viiwc8fjazrchbkxr63k4k3m9gsaay64jikq4prrnbpmz9ljng7" } }, { @@ -65752,11 +66289,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20240304, - 911 + 20240528, + 752 ], - "commit": "d533567a680bc87060c56a50f83d80e58646d2f2", - "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai" + "commit": "a0f79eba786d46f01aeabb5913aadc337e985d6c", + "sha256": "0x2rgy5f55zrgmcg4rz2ivrb8pws1v5yyy69bfkbqqggniplh5y8" }, "stable": { "version": [ @@ -66260,26 +66797,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 +67077,20 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240519, - 1546 + 20240603, + 1609 ], - "commit": "7bbf02f046e375c23fe5a90eb0a9557e843eba41", - "sha256": "1x7w6g535la7fs05v2xil4bggif7j9f3qphc49fz9ay6q6rfsc84" + "commit": "2b50a2e0d4c59ec465ba3bd8848743eeea13fc09", + "sha256": "0yf44n933k772gmav72l5svbl06pss3hnqqni8mi3vff0cy3sdva" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 0 ], - "commit": "32dec6d5d5725a7fe2d50537e46c224349008896", - "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv" + "commit": "2ad20cef1b2a6fc1e8b282f34127de82f6e463b1", + "sha256": "1kia04cs3xm2f3dvas9i6r9vz62xdlx6g5a0pz995gyxw91f7q3g" } }, { @@ -66874,8 +67411,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20240418, - 1642 + 20240420, + 1918 ], "deps": [ "cl-lib", @@ -66884,8 +67421,8 @@ "websocket", "zmq" ], - "commit": "f1394d303be76a1fa44d4135b4f3ceab9387a16b", - "sha256": "0346ws7ym873dc3xbmpzlg371v0rgclz93hbfzcld7gv4g1dncfb" + "commit": "aec436af541549ccd02e23c066a6c497d1365f6b", + "sha256": "1cssm3jrj20n9wjcqq4sz74rx0sm6yg5dbskn9d5h86df00af2zh" }, "stable": { "version": [ @@ -66935,8 +67472,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20240224, - 428 + 20240701, + 1259 ], "deps": [ "f", @@ -66944,8 +67481,8 @@ "s", "transient" ], - "commit": "1b16ca44b227dc761a2c8631690140f62e024f98", - "sha256": "1ciwiamby7w8snkrn6c3s7y5fyfpv6982rihfx6gmbsg0r6vgmwl" + "commit": "e74fef3e99c5c9e2e1a8495c539e1eca2cd0676d", + "sha256": "07gj3xfwim1df5c1dck9a3w00xg4syywmfzdayby5af79lrbcyrf" }, "stable": { "version": [ @@ -67144,14 +67681,14 @@ "repo": "bram85/kagi.el", "unstable": { "version": [ - 20240424, - 2021 + 20240629, + 557 ], "deps": [ "shell-maker" ], - "commit": "b3d45264fb25aa95130352c65bc87ec4659e6e71", - "sha256": "0jm4h2sbj7wn6s520zi62l9iqggp2q5whpncc1mb3ckfvwn0vhfk" + "commit": "eb767d1e0dc56b14ebc8f4362890b7fd2be7a542", + "sha256": "0gs7lngj5ng6caiafh2hzjjwb3zm95j9kzslxis20lyqmpp64r1l" }, "stable": { "version": [ @@ -67272,17 +67809,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 + 20240709, + 1230 ], - "commit": "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d", - "sha256": "0dbdv64yzhrhhzg0asxnabzhv1jhcihmkby3ilw8hgls0w0r24c0" + "commit": "2cad3191be7c574d0fc933a8566468fa520862e0", + "sha256": "0pmy0vjd05vvciryjkscpnmknd5kvjm61pybz4nbzckkzqd6r9g2" } }, { @@ -67323,30 +67860,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 +68063,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20230709, - 1321 + 20240713, + 1007 ], - "commit": "c0d24fdad4248e0291685b47a02df54e9f980aba", - "sha256": "0bd5jp1qy4d4v71jfn3qp7rfwfbjvsbcmk9c6m4dympv1w9dp56d" + "commit": "e1726f89dab1811a110eebb3f3e4b673742faf05", + "sha256": "02wwr40jxny9w0xnjwi4n40hn5jmdkkzng4rml846hw4ih1vxc0k" } }, { @@ -67556,8 +68093,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20240428, - 2141 + 20240621, + 2110 ], "deps": [ "async", @@ -67569,13 +68106,13 @@ "s", "yaml" ], - "commit": "ee667b6581113be21e7d24935cf8a431eb382432", - "sha256": "038zqsgbg4j7mrhw7rf61qp0bja2m675rhxk6y8bbnvkva8z24w9" + "commit": "2460094aede77054f3200c61d807a445e3b79c9a", + "sha256": "1izyfhabmlqhbn0zv0vxc8c2ncxs26qw17k4772gpksvxxa29i44" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -67583,12 +68120,13 @@ "dash", "f", "ht", + "memoize", "plz", "s", "yaml" ], - "commit": "642c415a833a7a2aa1fb577261b1e2ae0c4bbb72", - "sha256": "07yb4sdgzqwr7snpvmc72zvpc5aq37gmwbjq4b05rwcrhcv88kc6" + "commit": "beec4a76c090101d8a98e631c292207be3c3a6a1", + "sha256": "0h67jvvql9z969wzzxx8g2hnnzxw5p1wqc211258bgyxm6p25yzq" } }, { @@ -67758,26 +68296,26 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20240415, - 1539 + 20240618, + 1727 ], "deps": [ "compat" ], - "commit": "04fa2c65f0ae901ed3015f691ea70f7658ea24b8", - "sha256": "088grlq97g5csb1w84mjj7ffc3hjg55aa2i2km63xqx112l7h3m1" + "commit": "f04466cd8f8226715f113635204dc978171f63b7", + "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 0 ], "deps": [ "compat" ], - "commit": "c47fa154c756abd044da4a1353c30b978782f7dc", - "sha256": "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7" + "commit": "f04466cd8f8226715f113635204dc978171f63b7", + "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml" } }, { @@ -67861,26 +68399,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20240415, - 1539 + 20240628, + 1857 ], "deps": [ "compat" ], - "commit": "06572084a7965b86262d7f1b52c32ed2dde86a9e", - "sha256": "1mlf3g1ywbh4xk5fv0nq9fw6c39xh9r87csr8c09dkrjlgp0fagn" + "commit": "6605cc638e22865f2c9b98345db4f9f52a2c3d2e", + "sha256": "012yhg74r52yx8ma8cid75i4hhqphx63lvjasrszkqmaxlqq2g5i" }, "stable": { "version": [ 4, 0, - 0 + 1 ], "deps": [ "compat" ], - "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", - "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" + "commit": "ff539a421f750e6e06ea38a6757461598f857a65", + "sha256": "1nb9s5v00r4kx39pa7z7b419xzlv108ilp6b9drx6wzsb1lil6fn" } }, { @@ -68053,20 +68591,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 +68645,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240501, - 1100 + 20240707, + 1256 ], "deps": [ "dash", "transient" ], - "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", - "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" + "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112", + "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w" }, "stable": { "version": [ 1, - 12, + 16, 0 ], "deps": [ "dash", "transient" ], - "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", - "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" + "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112", + "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w" } }, { @@ -68992,8 +69530,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240517, - 1837 + 20240712, + 2254 ], "deps": [ "async-await", @@ -69004,8 +69542,8 @@ "request", "s" ], - "commit": "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f", - "sha256": "0gfkxxdqli97x81pcxj1p3w1z6q5w7sn7q636hycrj97v3rdv8br" + "commit": "0528ca5c9e445700d7361b4263e85f618686fb38", + "sha256": "14qaz5grvkhy4sa6743qblg6b1r17zy5cpwsq1qxqml1kaliiv9q" }, "stable": { "version": [ @@ -69285,11 +69823,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20240510, - 1342 + 20240609, + 1616 ], - "commit": "435114f208b97e97aa1576ef1966a33d90cad01b", - "sha256": "1gwdiyvzm3dz1dj5l763f1v68bb15g5qfmy5b9p58695l5hi135z" + "commit": "44452e4f7962aca41cc2539fce1d27799d6e656c", + "sha256": "1x87qrqyg12w5ncgv6592amp08bpdn4sybhwyf3nwfp8zpfficms" }, "stable": { "version": [ @@ -69893,14 +70431,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20210816, - 1107 + 20240618, + 10 ], "deps": [ "leaf" ], - "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e", - "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6" + "commit": "febda9969046019aae3bf3b7d1f042e9dbef2af9", + "sha256": "0d2va4hj66kq0v60caxvl20fpqvz5z9wv1rw54vp765ccslv7y05" }, "stable": { "version": [ @@ -70087,11 +70625,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240423, - 445 + 20240709, + 1803 ], - "commit": "c66e3e9adfb5d91f83a401387fad345f12004c8a", - "sha256": "1i0rar36xzv2gqkn8cn29m5xz0pwmd5y5in8iac2h2fcxvd48vc5" + "commit": "17983be9e9de42eadccd50709ccc1d3c147e85ca", + "sha256": "008hb5d9xyq16mfgxg1hll4szf12q4r1i4p6kc3l7xc7ancb7vr6" }, "stable": { "version": [ @@ -70179,15 +70717,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 +70906,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 +71317,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20240101, - 857 + 20240707, + 730 ], "deps": [ "fringe-helper", "ht", "ov" ], - "commit": "91d8f57f11f5ddbb5e94cb23877c67a8f59d4d8c", - "sha256": "0pvyfnf7qy6m0gwbmr74lvmrki6cpm9k836bbrsjdh7rip4k6xrq" + "commit": "9c9248aff4aca8ae09fdcf391a315569d9ed4c65", + "sha256": "1xhlrb2wxm9pny79bs6cclmn72bhm1xh4brvqbxk4wannj3w4zkc" }, "stable": { "version": [ @@ -70899,11 +71437,11 @@ "repo": "martianh/lingva.el", "unstable": { "version": [ - 20220910, - 1435 + 20240607, + 1120 ], - "commit": "6c33594068fa33de622172503deeec6778d9c744", - "sha256": "0r2f4wrd2v67m7198z0194pg853hbq4vvpd3x96y5ikbypywf426" + "commit": "c4cd68fb3ab1ebf419be0ec92b77d9feac921a87", + "sha256": "18kl31d5cxxj990vi11b9k0q2hhkchgb5d326h9v912d0bv64qfm" } }, { @@ -70937,14 +71475,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20240409, - 1250 + 20240626, + 1159 ], "deps": [ "avy" ], - "commit": "9ead085e9e6798ec4ea4791d9906d6655ea2b402", - "sha256": "055p9p6qnzhnlm97gnbjwk1dls796zsbsvcphlivkx4zlval099w" + "commit": "391930f2010014b9b5bc16bb431db01dd21ca7bd", + "sha256": "05arbdh5z3hk9z1h0yyafx51hakm9xgsdf8l1ha4bw686r83zxh6" } }, { @@ -70955,11 +71493,11 @@ "repo": "erickgnavar/linkode.el", "unstable": { "version": [ - 20200607, - 2152 + 20240604, + 53 ], - "commit": "e31bdae11ff38b736b1869fbe94920e862f29794", - "sha256": "1klzqwnfb8f33ycx9nhlmbmmy61lgq1nqkkwr7s2gb9y0bxgfzzl" + "commit": "5152aa3ba7a4360133efd5892f0891837af30440", + "sha256": "0c9ly7lf1ydn3zjqn265vkjq4n4qn3xvr4lhs66gh2krk8qrm9cm" } }, { @@ -71659,11 +72197,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20240419, - 404 + 20240602, + 513 ], - "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7", - "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx" + "commit": "65eb99ca34c306c9f495ac199b9365f46f50ff03", + "sha256": "13d657gdviw6k61ivq8gd8hmapp968bq3vk82giih703isx065md" }, "stable": { "version": [ @@ -71773,11 +72311,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240520, - 1947 + 20240609, + 1445 ], - "commit": "cea812d16129749deb524771e615a4a831604a83", - "sha256": "1wlc1m9w5s03w91i132yzxbd93pdfnxsf0pq56pfsl6xvrqbj82k" + "commit": "485949eb0122203b388a2de3a46a7a770a2cb622", + "sha256": "1rh3nm9s10pq3l4nyz89f79l5nzrsp6k7p5hlkjqxbk5f6sgcmii" }, "stable": { "version": [ @@ -71951,11 +72489,11 @@ "repo": "fourier/loccur", "unstable": { "version": [ - 20210224, - 2041 + 20240610, + 1830 ], - "commit": "01b7afa62589432a98171074abb8c5a1e089034a", - "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2" + "commit": "f47c53a24a9d262898517c71284337821dad7ea9", + "sha256": "08slwg063x51c2dm742sd7nlq5zf20xrdyprwk3irdanpn9skxjb" } }, { @@ -71974,6 +72512,30 @@ } }, { + "ename": "loco", + "commit": "80862bea5a620c338af456f1daff6de13f7650de", + "sha256": "0r67b3fd91w6nvifc3hydiihh2456sfiq5wr98shbd76b1zgimjw", + "fetcher": "github", + "repo": "csmclaren/loco", + "unstable": { + "version": [ + 20240712, + 1721 + ], + "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63", + "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm" + }, + "stable": { + "version": [ + 0, + 1, + 12 + ], + "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63", + "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm" + } + }, + { "ename": "lodgeit", "commit": "c82e72535aefade20e23e38931ca573e3459401e", "sha256": "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq", @@ -72350,16 +72912,17 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240310, - 50 + 20240708, + 156 ], "deps": [ "compat", "map", - "seq" + "seq", + "stream" ], - "commit": "de9a2933f4794d13236236db6165403d722e5105", - "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv" + "commit": "1c2a2164f24174a87194649f0286e0432594c84d", + "sha256": "1hrzyh6lzxl4pl8sg4lkqz3840pw3ngm3zlpq66qnwxqkq11dcsk" }, "stable": { "version": [ @@ -72628,15 +73191,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20231011, - 1723 + 20240705, + 832 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "89d16370434e9a247e95b8b701f524f5abfc884b", - "sha256": "0j1a6c1vz57xvk64n32qlaqwpvg91zh14ik7ajpyb7xm8gbw5ahv" + "commit": "1d15706321ac86ce2275442fe67c2778ecb567a6", + "sha256": "0y56l4ln8l5cg2jidr2vvr3ri729si88yfpfv72zf5dmzvyhlgar" } }, { @@ -72698,8 +73261,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20240501, - 1928 + 20240524, + 2207 ], "deps": [ "dap-mode", @@ -72711,8 +73274,8 @@ "request", "treemacs" ], - "commit": "37c95ef7e992001250d893277acfccf4af0099b4", - "sha256": "172mp8na5w3dc7k6rl543dar85siz15vlhqidinim8hg9c4v6xqz" + "commit": "4909c14b9012eed669a9c3f11a8df055d5bb8a0e", + "sha256": "0qw824vdqk92r8hrrjsi7pd00rw60wf5jfjk1x3nhs06hijs0x0s" }, "stable": { "version": [ @@ -72932,8 +73495,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240514, - 1430 + 20240711, + 212 ], "deps": [ "dash", @@ -72944,8 +73507,8 @@ "markdown-mode", "spinner" ], - "commit": "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a", - "sha256": "17r4jg0i9df74bbphi4809l3q3mqy462syw5msf0sjv7k0f5fml0" + "commit": "52987755175042b9569e32d72ae29eba119020d6", + "sha256": "0sj9by3xnpc8xdj7df3x2lfkv32hwq9bakcdyyjhzaydkivsqd6s" }, "stable": { "version": [ @@ -73093,16 +73656,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 +73801,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20230814, - 1954 + 20240628, + 2255 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "d131779950d5d45c3129eb088cef5fd11099f47c", - "sha256": "0qr9cmk148rcvn0swnvhicyy89n6lw8gkchxvvd8lwwl4ky6x9pb" + "commit": "043bda7b2210440169a4a551e16ae9a093a14589", + "sha256": "00f6sm8z54jl2vka5nyx73qh7lq3d1j565w1jxy98jfvxfjw8jq1" }, "stable": { "version": [ @@ -73918,8 +74481,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240522, - 204 + 20240711, + 2313 ], "deps": [ "compat", @@ -73930,8 +74493,8 @@ "transient", "with-editor" ], - "commit": "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70", - "sha256": "1xghq21qqjb2b31i75rd7j0h4fk7242vhbq976q1hls5j7a7x2mr" + "commit": "7b4ab4348ea9ab1022a2717c2bcada62575bf091", + "sha256": "1192369nkxb42mfv0bwbjmdmbyg4k624kw6xsycihm0xs7691kzz" }, "stable": { "version": [ @@ -74047,30 +74610,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 +74797,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 +74838,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20240406, - 807 + 20240625, + 356 ], "deps": [ "dash", - "gptel", + "llm", "magit" ], - "commit": "3584b1036574c704e5bae04274b8849590a097b0", - "sha256": "1rfiaqdpkf9xh57gf4vsz65f2mnhzxyadddwxyk1yfzan1il7j01" + "commit": "91b23fde4a880566a4e493240865e3582cad7306", + "sha256": "0zbj8bk3vdzfpih8242gan7a8i4gkmixxzs952mm15wg2fd98gm5" } }, { @@ -74475,15 +75072,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240508, - 2349 + 20240710, + 2125 ], "deps": [ "compat", "dash" ], - "commit": "855d924969eb6231d62ab446f727c9f7ad5c4913", - "sha256": "0x13wwm6f93qvaqq7qlx97ahvbvgkqf2xdq7vjn6wm9h2mdkw4hh" + "commit": "804c623cf6fa50a291273f582e3355fde408239b", + "sha256": "0ml7vg70c7yqn3qy4zjx17psk0cfxp8nj8ck90y9piq6a1kpxwdg" }, "stable": { "version": [ @@ -75303,14 +75900,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240404, - 451 + 20240710, + 953 ], "deps": [ "compat" ], - "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc", - "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0" + "commit": "40534231fd2805aa17ba3c59fd57e6a34b5a526b", + "sha256": "0jvd8vjhwvjv9f2h16dqc3c8ax3mdcfak5lik0p8m8kfzrb4grl1" }, "stable": { "version": [ @@ -75445,11 +76042,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240501, - 1057 + 20240626, + 826 ], - "commit": "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89", - "sha256": "09v1vkj02l58kz74rqh3vdfy75gi48pvcaz99k9i54wncy61bv5j" + "commit": "8aab017f4790f7a1e0d8403239cce989c88412f6", + "sha256": "11922fkzsglvmfqzz0vzkg6w7q83qb0fkv2q7xlp1xi995041wqp" }, "stable": { "version": [ @@ -75790,28 +76387,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240521, - 1721 + 20240701, + 1604 ], "deps": [ "persist", "request" ], - "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", - "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" + "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53", + "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8" }, "stable": { "version": [ 1, 0, - 21 + 24 ], "deps": [ "persist", "request" ], - "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", - "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" + "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53", + "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8" } }, { @@ -76434,11 +77031,11 @@ "repo": "gvol/emacs-memento-mori", "unstable": { "version": [ - 20240429, - 327 + 20240702, + 2332 ], - "commit": "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e", - "sha256": "1drsc9akr48q5bxrw43fs2lqjp5cdf2nxvng0nvr5v4xvckd1a9x" + "commit": "c53707871aa5aeb551c6b9c02bdca6f477bc9c5b", + "sha256": "1g70dsfm678jg8r7sg4661w9af0wqdl4csxg6vb76f4n44jy7zvb" }, "stable": { "version": [ @@ -76535,11 +77132,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240407, - 1642 + 20240712, + 2221 ], - "commit": "99e08c92bb5d8a695062ce53e2cffeffd3a058a6", - "sha256": "12fp6bj38a4rcxrra4w50wb4qrl5jbw1wyp5hhx26ayh99ajaigi" + "commit": "369014fd92e44f4cec54a78fa9be11d35b44f277", + "sha256": "0aj3hhdff5vbp97j09ch5ajdhdmnvr0gbj0f2xibqxyb8k1pp9jk" }, "stable": { "version": [ @@ -76552,6 +77149,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 +77186,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231201, - 918 + 20240604, + 1521 ], - "commit": "ad9955c76b1cb031e847e139c5cf7b7cc5cb4696", - "sha256": "08p6zx4swycc4wi5rhynyip24skwhg0y1zlz4krrs9ar6m2lmfwm" + "commit": "bd900fd6cda97cfd10f2bf520848d0a8b0fe35b7", + "sha256": "1866y962v1xpw5klwn9sx8fvfhxg9w5sdj66nms815qkrkd3gvmk" }, "stable": { "version": [ @@ -76752,11 +77379,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20240218, - 1834 + 20240601, + 1647 ], - "commit": "c8f4fbf075bb5db2bc0872afe02af2edac075e4e", - "sha256": "135glcrnbr7wmrygrngsxpma8bxajpxlanbkvk08v92p7ar6a21j" + "commit": "0449c649daaa9322e1c439c1540d8c290501d455", + "sha256": "0mmz5rqb0v668indj132kaiws1lcm1pw81pmq2nwx0d043dsci8k" }, "stable": { "version": [ @@ -77055,8 +77682,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20231213, - 230 + 20240628, + 2350 ], "deps": [ "cider", @@ -77067,16 +77694,25 @@ "projectile", "s" ], - "commit": "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a", - "sha256": "1flxvaj8j5kg4r0cvns8z1xixgvsavq1i27z28j97m8dmndihihf" + "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76", + "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk" }, "stable": { "version": [ 1, - 0 + 3 ], - "commit": "3119214ff45db630789f9371f956d5ac06229b1d", - "sha256": "0mnvc3f56x4icrqmc4kx6bzc9vac40f020npimdgiylbmyxj97vn" + "deps": [ + "cider", + "dash", + "geiser", + "parseclj", + "parseedn", + "projectile", + "s" + ], + "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76", + "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk" } }, { @@ -77284,11 +77920,11 @@ "repo": "erikbackman/mindre-theme", "unstable": { "version": [ - 20220827, - 1031 + 20240610, + 2131 ], - "commit": "fc9ab1ba03494f2fb8cb8dc4e2ba5120ae35eb31", - "sha256": "1xqaxrzq7ws8ilbcmx5kb7g7xhch91lb9cisjydmi0xcfv34sxah" + "commit": "cbecece36988f83b7e355a3fcf5229f2494f3688", + "sha256": "1xhql4wy7r5f8bx4k1293gawbw83agf1s6va073q1pxqd94rjk6y" } }, { @@ -77361,28 +77997,28 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240518, - 849 + 20240612, + 1328 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "4e2918225bea7fa7d232260bd0b2de48df68c6f8", - "sha256": "1bccmx0sd7qjfgd1p8yskw12phxc89arbiz064xk9jcl1cxaz57x" + "commit": "802321f0658b364d4e9d90a4ac43959d46048015", + "sha256": "1jkv1bhgiznxaj1jy8si505k86179wdnwipcqr2bgqckpr5dg7rk" }, "stable": { "version": [ 0, - 9, - 2 + 11, + 1 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "f0feae3bbd0becd79ea086d4a1b811162470b162", - "sha256": "1wz5ssp480zlfxdvgywxx72gkf7mldrd4gxah18ys09yycawa0hi" + "commit": "b556c0fa68dad76a478bd3f508e0501aa6933689", + "sha256": "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa" } }, { @@ -77592,26 +78228,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20240415, - 1544 + 20240618, + 1732 ], "deps": [ "compat" ], - "commit": "ef234da0625397b994c0a17d1038037732c3c457", - "sha256": "1zd1gjg16yggmccpvv7fv32pfmh2a6227p21q2vdh8f1p0bwm10p" + "commit": "4566325917791b878430526f42349a644b03089d", + "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat" ], - "commit": "62948a4a2951dab0716977421bfe0a87ea2583c5", - "sha256": "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m" + "commit": "4566325917791b878430526f42349a644b03089d", + "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g" } }, { @@ -77760,28 +78396,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 +78508,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" } }, { @@ -78215,26 +78851,26 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20240415, - 1545 + 20240618, + 1733 ], "deps": [ "compat" ], - "commit": "0ff591110c9db0bbc1372234902e28486c168a86", - "sha256": "0whjiadyygq8i3mf325zha8jl6hxm1q44rwvmlzvxzmjm42ag2gg" + "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b", + "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj" }, "stable": { "version": [ 1, 4, - 2 + 3 ], "deps": [ "compat" ], - "commit": "8e58bd51f1a8292c5df92e75a8c4a470e11a03e4", - "sha256": "157zssn9f5jd1b011x66ii97vmd9a16ng556xwlbnmqkcw2w42gq" + "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b", + "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj" } }, { @@ -78389,11 +79025,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240505, - 331 + 20240709, + 638 ], - "commit": "d2762db19ed48bd0cbba61c41940be479760a35e", - "sha256": "1y8z4yfnqic9gg2nm0rqldhwkfz134zxv1x57x3jh9k04p1nblc1" + "commit": "a9f709e3448ff3def66328db74f5ca41366da957", + "sha256": "1ybhq9xpm3p7h9nk2a9069b7sw8v0qvwjjk1447gf26p5ah39dgl" }, "stable": { "version": [ @@ -78580,11 +79216,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20240421, - 1234 + 20240627, + 317 ], - "commit": "3cb92a75cf20e1a5394e77e0e44a6b1c14cf315b", - "sha256": "1jzjy4pwwlyphj0warfywfqm2025wfkb8hvnn0478j26hs7141xs" + "commit": "3db3fa4ff88fc77fb56a54eee345bf326e0fa963", + "sha256": "0il28846vkql28a0dxsfncji9i2zmbqy4y6mdh4hbhg6xl16qbvk" } }, { @@ -78640,11 +79276,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20240324, - 1830 + 20240710, + 1027 ], - "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e", - "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk" + "commit": "9222cdf8209f0c3329f857ccb9edc1c79b06041a", + "sha256": "19zv7q9ixrvf3qbfj8xchcn7n0in6rpnkl4dd2vzbvic2lhg7nnr" }, "stable": { "version": [ @@ -78751,26 +79387,26 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240520, - 1715 + 20240618, + 1736 ], "deps": [ "compat" ], - "commit": "1faf8c16073bb62ade53906eef549ed8ac79ae70", - "sha256": "1jbly23pr5lhgd9i6c0619v9pfrppk6614czf0wvz8ibkgdwsk2c" + "commit": "7f7d390bd082c0786cc52618866905f28e31ec98", + "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "compat" ], - "commit": "888e6fb37eb5122803c70ae60d28fc54589e26c0", - "sha256": "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z" + "commit": "7f7d390bd082c0786cc52618866905f28e31ec98", + "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03" } }, { @@ -78878,26 +79514,26 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20240415, - 1545 + 20240618, + 1737 ], "deps": [ "compat" ], - "commit": "ea728ba7dbae47d8516a6026038c305092d38078", - "sha256": "0qa4i6hx9xljrmhds7xfnyq391p7hkzdmkfa16yhfs75479dw805" + "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0", + "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf" }, "stable": { "version": [ 1, - 0, - 5 + 1, + 0 ], "deps": [ "compat" ], - "commit": "b7e2066a69c059c5d4c72e829b615a6b15cef4dc", - "sha256": "03q388lkbs1fx0x0wb0n06f9bfl4k67qvbhkxkw59kdlhxi7qwqm" + "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0", + "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf" } }, { @@ -78960,6 +79596,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 +79775,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", @@ -80585,11 +81268,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240327, - 819 + 20240607, + 1946 ], - "commit": "a044e5eb5bf9bbefe34982ae9cc80ac9739a3e58", - "sha256": "13m17vwwrcs44xhzkh80nssgsn9p84f5vl50zk4y1712d087pc0d" + "commit": "84b28f3f5dcdd03205d5ff4764704806019ff332", + "sha256": "14816rkx6xws5gx9az4g3dk06cg8wpa3zc2iixyr4q6qc9xbp6yq" } }, { @@ -80934,11 +81617,11 @@ "repo": "skeeto/nasm-mode", "unstable": { "version": [ - 20190410, - 342 + 20240610, + 1505 ], - "commit": "65ca6546fc395711fac5b3b4299e76c2303d43a8", - "sha256": "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562" + "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1", + "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj" }, "stable": { "version": [ @@ -80958,11 +81641,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20231218, - 316 + 20240628, + 1901 ], - "commit": "56b20b414a9298f45b0923edf633c7153b97892b", - "sha256": "0d4h36ns13fra744nhk9azxqmxw14fwn908i3f1h2f4ll3hqbpfa" + "commit": "14e0a434cffa5688992b30d1b29bb21c561f8cd0", + "sha256": "14zrrvwppv12wj6rrp1agsmbpx9cmx1zr03jpc9162xz7sdq1szk" } }, { @@ -81186,20 +81869,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" } }, { @@ -81287,11 +81970,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240520, - 1050 + 20240524, + 311 ], - "commit": "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e", - "sha256": "0x0zipfdm6w861kmw3jjjsc1jqxdw0ggpylvwxbgbspfngl83awj" + "commit": "3dac80b712fb3043ec2bd7510f587548074484a3", + "sha256": "1nf6hjjkp6r9cnf6gzb2hsxp1z638b04h4yl5gsl0knby3zpip1x" }, "stable": { "version": [ @@ -81594,11 +82277,11 @@ "repo": "vekatze/neut-mode", "unstable": { "version": [ - 20240414, - 2254 + 20240610, + 2326 ], - "commit": "e75f5f6bbcab4c042f331fcb2d0a628516cfec5f", - "sha256": "16iv3vn3inwjh29zk00w1l1cm8jqp96n2hrkgpmhcj0kbliy298h" + "commit": "c723e0a2e1f14b7f41d824ca354b0590399e2bc0", + "sha256": "0gcw7s3phyyidll37dm7cfrrvj7b7j5iqsbam5a0lpbi1p38rnlj" } }, { @@ -81922,11 +82605,11 @@ "repo": "ninja-build/ninja", "unstable": { "version": [ - 20230421, - 1748 + 20240528, + 1945 ], - "commit": "adf9bddd73869084a505fac83246e55c35880079", - "sha256": "1p6nrqsjlpr1kkndihdkjl9cm37xblaky3jda6484y6d51mixgrv" + "commit": "0b4b43aa3e2fee391443dcc0c961c9d2354d8954", + "sha256": "1g779g7x1d0f7vi7d2sraqmd9zsccnmglp9fn7w5146swqpgsvqp" }, "stable": { "version": [ @@ -82090,11 +82773,11 @@ "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ - 20240514, - 1605 + 20240710, + 1039 ], - "commit": "49d890e86a4597911366208930af6457ce1d46e7", - "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5" + "commit": "59ad17690576190811e0746c12ad6809596ca3ac", + "sha256": "0c9hxvh8v1pz4ni087dw84wzr7db057fgb37rk1qhjca0yq01mhf" }, "stable": { "version": [ @@ -82291,8 +82974,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20230705, - 1328 + 20240629, + 2347 ], "deps": [ "anaphora", @@ -82302,8 +82985,8 @@ "s", "virtualenvwrapper" ], - "commit": "221963fb0b7116729829145f055ed750d0e2f961", - "sha256": "1sha2sdamq583xaaiqx40vl12ahbsk93ksx7xwp5mmvgsns7wppk" + "commit": "f8e26834b523c03dfcb0c751373123ffd32b8522", + "sha256": "1a0b0dk578kw33qgfbb4zvqnc4cmix4mfwrlqy2rcg13z3ax39c7" } }, { @@ -82334,14 +83017,14 @@ "repo": "ranmaru22/no-clown-fiesta-theme.el", "unstable": { "version": [ - 20231214, - 2115 + 20240708, + 1611 ], "deps": [ "autothemer" ], - "commit": "0cd04a72aa5dcf61e82e2a613670334816326b02", - "sha256": "0ly95561skwfkn3kpv3269ffk7sd6p92dm1q6p4cq2fbm3v0w6xd" + "commit": "857c6261b6047855c9ccb4e9af3ba6b456566fd5", + "sha256": "12d7fzax3nkn2mnhaq980zkfmwzy5spa2shgam7pq5y5ay0bi754" } }, { @@ -82367,26 +83050,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240415, - 1545 + 20240624, + 1447 ], "deps": [ "compat" ], - "commit": "554d890c5d5b59ebcf83c67256d0012e23cd07f0", - "sha256": "0x0dk7yvrzcw1pjn86gqck5ksg48dnipvwir6va20i7cgi060qfy" + "commit": "f45335ede7c1246f922816610139face112e236b", + "sha256": "010ldsn75xrbjj82115gxib150knj9q76k1jwpz1rd1alx0l16qj" }, "stable": { "version": [ 1, - 5, + 7, 0 ], "deps": [ "compat" ], - "commit": "1773beeb23c43ce52428957814a2be62532870f8", - "sha256": "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr" + "commit": "9078334e44393696c78c6acb4484480fd4cf4b5d", + "sha256": "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4" } }, { @@ -82637,6 +83320,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 +83398,11 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20240311, - 2147 + 20240626, + 1936 ], - "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b", - "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss" + "commit": "72043ab206dea50b366b3848e8f66c0a7737bda4", + "sha256": "0mlpqzql5jghssnx9i474gvc0rdj2sw9wsd46pgs2xn7lcqfjgrf" }, "stable": { "version": [ @@ -82798,11 +83504,11 @@ "repo": "MetroWind/notink-theme", "unstable": { "version": [ - 20220114, - 1955 + 20240625, + 326 ], - "commit": "6115857fe75c1adbbce4165a2b77a11a271aaf31", - "sha256": "07gr1apbhd4kli2g0ld4yzpsc9hvkrh054b2dk47l2p9d1ki1j7g" + "commit": "d1e84622a491bb570d6a450706833fafaad74f39", + "sha256": "1xqjh28hpavk1lq51fs4nmpm8zkz8i7skrf034460kilnzyh2csr" } }, { @@ -82813,11 +83519,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20240406, - 1803 + 20240619, + 1038 ], - "commit": "cd89065dc36e36b22a2a53832d2cac9b06fba41c", - "sha256": "179x3kz1504zlilh5y5h50sk5d0d9rhl6r6ccfgp4am2nn0d1qp7" + "commit": "b526c5ef0e1ae78380e68e5a24170542b884cbe3", + "sha256": "0is93vccnhz1gliiz6xh35xxwr2ginvgr094dkz5r920lhvc5s61" }, "stable": { "version": [ @@ -82837,28 +83543,28 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20240422, - 15 + 20240618, + 1830 ], "deps": [ "compat", "notmuch" ], - "commit": "e5755c5a752d2026b1c847bc5944bdd5f015c1a6", - "sha256": "0ysb99rda0ix6lcb8z8p72wb6z35agyn9jd1z0jxhqpp5xyajjsl" + "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4", + "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "compat", "notmuch" ], - "commit": "89ced49cf3fb4d62bd4fea8bf9bd53ec8e4c7176", - "sha256": "0wggx4cqh1zgmax99bx2g90h51f2jxahqr5f35d0k1770zsds7f5" + "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4", + "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y" } }, { @@ -82929,28 +83635,28 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20240415, - 1545 + 20240618, + 1831 ], "deps": [ "compat", "notmuch" ], - "commit": "3a7240e6728731b427a763228c60104602f0fe4b", - "sha256": "13cajk4pb0x5r9azxilibc4v9xg3pxqiy0cx14b6kh6l9b0f26pq" + "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6", + "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "compat", "notmuch" ], - "commit": "4686e8e7b6d88439d4b0c39c7b17502b102a6f58", - "sha256": "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5" + "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6", + "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n" } }, { @@ -82961,30 +83667,30 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240421, - 2351 + 20240618, + 1832 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "ef7a977a16e2c6a0ed3e139bdd6cc00a42b8c758", - "sha256": "1njy6cq7b9n2shvcgzrl8b3iclcyhx24bq1li1p292ipj3x3rkg4" + "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3", + "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d", - "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3" + "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3", + "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym" } }, { @@ -85166,8 +85872,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20231218, - 1043 + 20240713, + 906 ], "deps": [ "dash", @@ -85177,8 +85883,8 @@ "s", "yaml" ], - "commit": "24ff6ef051ba1f1a1e80a2132fdada37e77eaad6", - "sha256": "12va9svwgsjwakqw17ik8xzpda1w9fjplfj5i7aq10ic8yq6fkyx" + "commit": "5730759eb22d6d3bc78761865dd0f2fdb4100e37", + "sha256": "0llf7ahgf2rb0b2znq99mr1wkvxnh1lb0lppk2zcklqhdw05ylzk" }, "stable": { "version": [ @@ -85521,30 +86227,30 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20240503, - 1711 + 20240618, + 1833 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "f176ad73496ee086688ec5eeafcfff9372a833bc", - "sha256": "0gychpz53nhrrbs9w67400hbpyxp3q5jmhpj84fnqhnmf9q2dmnz" + "commit": "f58197816a6c7e2576696415aefad93bd778a224", + "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn" }, "stable": { "version": [ 2, 0, - 1 + 2 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "781c3518a537da2a8b5e8a4424f9441df463a147", - "sha256": "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd" + "commit": "f58197816a6c7e2576696415aefad93bd778a224", + "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn" } }, { @@ -85630,7 +86336,7 @@ 20240519, 914 ], - "commit": "5a7bd951d6135ff7ee3b45086308c14abce0936f", + "commit": "683a13adc4197af632b35484d2b58bdb1d6c9b5e", "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1" }, "stable": { @@ -85639,7 +86345,7 @@ 0, 5 ], - "commit": "1f8b3d5cb155f7497083001037a09a972befab21", + "commit": "c5ca99bcffd3f92444c182622ff2c7f161a01fcf", "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1" } }, @@ -86103,26 +86809,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 +87048,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240401, - 959 + 20240711, + 2002 ], - "commit": "ac4aeb66f331f4c4a430d5556071e33177304c37", - "sha256": "1nphxjsxd6bi7lbhx5r1nzay6gkkwhm1q995k90gg9zcnyxz9k0c" + "commit": "178b0c55f2cb49f27cd972f731ea45e5d3aea262", + "sha256": "1pm4xaf7394gbjg5g9vwdn99ii7swvna88g40h1safhbbbc60ga6" }, "stable": { "version": [ @@ -86506,26 +87204,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20240517, - 1114 + 20240710, + 155 ], "deps": [ "websocket" ], - "commit": "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4", - "sha256": "1j6rr8kn10j9wxqwhs4yd9k4fzjf2rz545if23xwqlg6ca39l16x" + "commit": "812b59f88851536ed3ded199fb55d303c16c7c12", + "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk" }, "stable": { "version": [ 0, - 4, - 7 + 5, + 1 ], "deps": [ "websocket" ], - "commit": "44e1298fd1b6ca9466f13ab6aadb08be6bde0b12", - "sha256": "0bag3ysg94l8dbvn7qnpyv2cd9f164aipmvkmxpvrgw4xl41lcqw" + "commit": "812b59f88851536ed3ded199fb55d303c16c7c12", + "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk" } }, { @@ -86536,15 +87234,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 +87290,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" } }, { @@ -86881,20 +87579,26 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20231216, - 1234 + 20240622, + 947 ], - "commit": "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd", - "sha256": "19fayjglgr3vk365a2f0c2mdnww30cxpzmi1sl2p2n3mic21av37" + "deps": [ + "compat" + ], + "commit": "b667cfdde7631c656778473e6c87bc51e46280cd", + "sha256": "06pwxlhqcvz6fb8y4mm54r851x8gcqrwj3pgfnag7ydw881rlqg3" }, "stable": { "version": [ 1, 3, - 1 + 2 ], - "commit": "3e95313837898ec8660c7a8b0f601ec7edda7bfc", - "sha256": "0dixym930mxsl954rbjay2wk4p0r5d90jgz2cyv5hs3pa40msgdl" + "deps": [ + "compat" + ], + "commit": "c7c7dcc52d3ad78084ea15e95bd7f6037bf02543", + "sha256": "1xzwbvhj6x5vszxbrf1sws37i8m3kff3sf1xkzijvjn8c8da9r97" } }, { @@ -86905,19 +87609,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 +87752,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240415, - 1535 + 20240525, + 2231 ], "deps": [ "org" ], - "commit": "086a8f385138ef71f7e29f78f19fb3a65f8ee27c", - "sha256": "09j9sbjpj9bgxx2rrrmsyz9vk0xmhsljy6qrdjjzm230k80817xw" + "commit": "f406828d3945c434de13e8aa9f7707d3466aee1b", + "sha256": "05j098b74zkkibhl4h5pplnqf584py90lccsg7alnx0isgld28bx" }, "stable": { "version": [ @@ -87173,14 +87877,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 +87907,8 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20240213, - 1802 + 20240523, + 100 ], "deps": [ "citeproc", @@ -87200,8 +87916,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 +88102,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240521, - 1144 + 20240609, + 1058 ], "deps": [ "org" ], - "commit": "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9", - "sha256": "0750kckr7qfwnz5c3vr0s0d4nnfx3dshpgj19wh9yijq92v6q6mf" + "commit": "d0cb221502c9e104b6e3c358128b28761ffddb55", + "sha256": "12a5lmmblx644sav0jbhffqhw0ylqjwvy4p90wfy5ha4m4gkm279" } }, { @@ -87982,15 +88713,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 +89137,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 +89250,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 +89322,15 @@ "repo": "seokbeomKim/org-linenote", "unstable": { "version": [ - 20240325, - 320 + 20240410, + 410 ], "deps": [ "projectile", "vertico" ], - "commit": "4c081f4bbe13c48df7cb17f2f006465b8b95196b", - "sha256": "0a8pcds5vv5px47gzvmv94ymvhki7kjqah8i4w43f0lpx9dhwqzx" + "commit": "a015295ebf271c8b518238f7969a0b6e60429805", + "sha256": "1jn22rvlxy5d2p56vm2jgs5jz4nm76ji4xmd71pnc18x2ci2p2c8" } }, { @@ -88611,16 +89341,16 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20240312, - 529 + 20240713, + 844 ], "deps": [ "fb2-reader", "nerd-icons", "qrencode" ], - "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", - "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" + "commit": "73b74b9e5006934f1ef302142512f51396ae2761", + "sha256": "0cm33d57hygwk4rlvvzaqkkz4hz35i1pgs8apsymsf482hx3w0az" }, "stable": { "version": [ @@ -88875,25 +89605,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240515, - 1932 + 20240708, + 2157 ], "deps": [ "compat" ], - "commit": "ea829ce4b3ac035808d411b1a088e0947d75f554", - "sha256": "1igv0ph5nk0b6bav5fndgl5jrnf20hml0vkx81ia1amhv7isbiax" + "commit": "bf2cec740dcf41fe8b4cc1ecc537c4fc4c7e9403", + "sha256": "15lh3hlf9hgc2xjzr6p5myp512a9arfma3p9hlh7m10bhfpabxgb" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", - "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" + "commit": "0b7af08548e586c0d3b0ca4a683253da407220d1", + "sha256": "0bk8mz3va5vwkkvgvq761bnm9id8sb70rnf3ydq62ap27k0ab967" } }, { @@ -89079,14 +89809,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 +90357,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240403, - 2027 + 20240627, + 1432 ], "deps": [ "compat", @@ -89643,14 +90373,14 @@ "transient", "ts" ], - "commit": "c9370982bfd4df04b590762bd795a7da3012c4dd", - "sha256": "1df7qd9f74gvpixpqchn1j47g4iwq6r9cvpc2g9cnb9mb16r2mjk" + "commit": "b7d4856f926cb71e01427a940dc948a48b0a702d", + "sha256": "07d8zq0a89qc3yrvq8qkvdqgw4rvbrrhwgj08qqdk698ny96qiwr" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "compat", @@ -89665,8 +90395,8 @@ "transient", "ts" ], - "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", - "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" + "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", + "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" } }, { @@ -89939,8 +90669,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240509, - 1211 + 20240610, + 1833 ], "deps": [ "avy", @@ -89956,8 +90686,8 @@ "request", "s" ], - "commit": "e435bc60228b985806ea7ea0856ceef1e5262c83", - "sha256": "1d13p33aypa3jip4xs5lx6vsimv7xg0m766nm35xapbmjjfihjkv" + "commit": "7ab51359954648c20753f66039a33d3b4993eeed", + "sha256": "08y302fb5xbcg5sfxsf8xk956lr8qrvwmj5kfvbn9x0mc7v1jgmp" }, "stable": { "version": [ @@ -90033,28 +90763,29 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20221203, - 259 + 20240619, + 1307 ], "deps": [ "dash", "org" ], - "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734", - "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr" + "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0", + "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii" }, "stable": { "version": [ 0, 4, + 2, 2 ], "deps": [ "dash", "org" ], - "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75", - "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8" + "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0", + "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii" } }, { @@ -90104,8 +90835,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20240114, - 1941 + 20240703, + 1856 ], "deps": [ "dash", @@ -90113,8 +90844,8 @@ "magit-section", "org" ], - "commit": "2e94f55cc58f6dce2772a6f33521eb5afcf67265", - "sha256": "0hhq2qfdhp2nlnz3ldx9y36s95n6nmywmbfjrqgn2viwzap23xgn" + "commit": "6644cb27a902b2ceeca89e83fde31e6ad01be79e", + "sha256": "05l15xfv1cdyqmqw2y6m1rb68y4h0g8f6lv6qzqlxim7w17ja10c" }, "stable": { "version": [ @@ -90388,11 +91119,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20210629, - 2157 + 20240605, + 2257 ], - "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83", - "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2" + "commit": "6c2daa0b663d01a498dca2f2f4f4b645be1c365a", + "sha256": "0i71mgmvvsfycqlqj046184k3fzrqszhfffrjxfg2ai4lp9a8aql" } }, { @@ -90403,11 +91134,11 @@ "repo": "localauthor/org-side-tree", "unstable": { "version": [ - 20240130, - 656 + 20240601, + 1001 ], - "commit": "62169a26edfafacd681ecaf84289dd6b58be6c32", - "sha256": "1cjypg5fvvdd8flcbi4jyaql2bpd5xq283lxhgp9kr51x2ibzdnb" + "commit": "e8da5217ce23440a62f4a46ef60e2082b6284b28", + "sha256": "0cbnmw0ha6sbs1hvxv1j7mirdzy9kq3b1h60jx8a83gwgsbihzbg" } }, { @@ -90456,14 +91187,14 @@ "repo": "jcfk/org-sliced-images", "unstable": { "version": [ - 20240325, - 710 + 20240624, + 428 ], "deps": [ "org" ], - "commit": "f3964d4ba421953fe9f109a99811b6d884ca56ab", - "sha256": "0lf275dqvgjfsh6kfmrb05gxcv78ng6pdijj2b1c2arw4pwsjb0r" + "commit": "b98b88a55eff07e998e7789e0bf7307dd71db050", + "sha256": "0iq03zp3bm1ph5ryhx6zpjm830sliqj6bb7i0h2v0nfn07l0cby2" } }, { @@ -90686,8 +91417,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20240301, - 1602 + 20240630, + 18 ], "deps": [ "compat", @@ -90697,8 +91428,8 @@ "s", "ts" ], - "commit": "51c9da5ce7b791150758984bab469d2222516844", - "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4" + "commit": "17954dc4b064d7fb09719222045d31feae8aa923", + "sha256": "0bha2mfvfyz57lv02pkn0lk92qq7vmvxdpd43jfmcynzipia1b9p" }, "stable": { "version": [ @@ -90875,14 +91606,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20240422, - 607 + 20240712, + 439 ], "deps": [ "nerd-icons" ], - "commit": "2f8b66e7aa2227411665f36d96bfc8a1b184bfbb", - "sha256": "0qz3f8phczmpyj8n6m9851cscwb7z0nkn4b5w79k21pgfhcmp6zf" + "commit": "52f09a8c363b75dd8554285e61025aeb9c0d945c", + "sha256": "1146x53j9yl38w1j04q2zxyk8ca2q4v4z8akxgd0vcxcalicyg4l" } }, { @@ -91138,6 +91869,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 +92265,28 @@ "repo": "p-snow/org-web-track", "unstable": { "version": [ - 20240424, - 756 + 20240628, + 1032 ], "deps": [ "enlive", "request" ], - "commit": "92e97112aa63cbe14f7727b157eb3c11239bf86c", - "sha256": "1ni3l38zh2lzr2ri7vh6khp9c6fn4hafgc6234y707ysniz9dryx" + "commit": "bca3a6e159b1b939906f9fc033c7a93e6be3c41c", + "sha256": "0wgv5ikgdp7m6lx2y0p6cxb7zcqdflr99ymk9fz105f2adnv7c6c" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "enlive", - "org", - "org-agenda", "request" ], - "commit": "dab6a42982ad290564b09d2c1c3dbe3c63295964", - "sha256": "1v6zj6hkhn5xjq318vs5yhsdg6mgaw4qjd9fgi2fps7ry79drzf3" + "commit": "ee15faf47c308f37bfcfffe38e8f4ee55661af3e", + "sha256": "0g86fqn08lgxz71snfnbgmyihnfl50m0zr7ysh25w4b4bla234jy" } }, { @@ -91627,11 +92387,11 @@ "repo": "ksqsf/org-xlatex", "unstable": { "version": [ - 20230820, - 2133 + 20240707, + 1343 ], - "commit": "f3cac5ea904e78ae2b47723fdce96e8e87edbe7c", - "sha256": "06y7lapsp4s9h07hdsd8wigmy6r5l36qiqwmz7j1n8zp3r8xg0pw" + "commit": "8f25ba5e4784b3f12f5ac5c69b1a1d0695c53b8e", + "sha256": "1cg11gqisigpa9prkm05z7wlajffzmhjiymg7frbibhrskhfhrp0" } }, { @@ -91642,14 +92402,14 @@ "repo": "ymherklotz/org-zettelkasten", "unstable": { "version": [ - 20230613, - 1924 + 20240708, + 1242 ], "deps": [ "org" ], - "commit": "5863a057f9b41dfa4cbf383c325b3fcddbbe5449", - "sha256": "1ibwcwn47pgf6dpqz71cm6azwdngb3blkwclii0y876fmyqhywsw" + "commit": "ab31cf4436fabc7e44addf60f383a2ee6a4558e3", + "sha256": "06hn6j3rk279ys9k7izvm2176xm82y3j6hl3r4dqfg7ak3k52amp" }, "stable": { "version": [ @@ -91995,30 +92755,30 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20240415, - 1547 + 20240618, + 1835 ], "deps": [ "compat", "org", "seq" ], - "commit": "e513f25024b2db082dbdbd8bd713d57a2b7456eb", - "sha256": "0dmh9j9dz3j7h881126zj9bpbzh5sr444qw5029wfmsq4x5ls0yg" + "commit": "6d482393c45f52c793b7ccfac871c87937a58640", + "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "compat", "org", "seq" ], - "commit": "afbeffdfa15a9fc532bba2e03626b9e82768ba2c", - "sha256": "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him" + "commit": "6d482393c45f52c793b7ccfac871c87937a58640", + "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j" } }, { @@ -92136,11 +92896,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20240228, - 720 + 20240616, + 506 ], - "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88", - "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92" + "commit": "f343b6009d87630588d39dc3d92651008c1bad13", + "sha256": "0dig8axp5isv39nxmx1387yg9dy8cwl47qk8a1m0jv2dsybagw4s" } }, { @@ -92181,11 +92941,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20240228, - 719 + 20240616, + 528 ], - "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d", - "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa" + "commit": "441a426447965e9b4dc1b0a1fc010c07192f73b6", + "sha256": "16isqgnysbp64wvgl9skyhfqlwjxsvs4i8k5zzaxm5c7jrcwc78l" } }, { @@ -92344,14 +93104,14 @@ "repo": "minad/osm", "unstable": { "version": [ - 20240122, - 2255 + 20240708, + 2157 ], "deps": [ "compat" ], - "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30", - "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx" + "commit": "17dfc017cdb0cf21325a9e636fd23e912aea84b3", + "sha256": "17zk9mrh7w1bj0z0a95rfa41zp2a1lygf6khls77z58gfvffqfjk" }, "stable": { "version": [ @@ -92649,26 +93409,26 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20240415, - 1547 + 20240628, + 2016 ], "deps": [ "compat" ], - "commit": "9f5c75e996388ead3472cd0dce8e9fc00407e210", - "sha256": "11jn4y2pa5v6bkijaf0d6ahg9zbz4mn11v9g1j46ldjwg3c7mbsf" + "commit": "8f1b8ab4c49b30d0a58b55666463ed2318150178", + "sha256": "0zw7qmrq2sh01av4871gkybn24nh5j64g04h5axvhls6znyv7pxq" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "compat" ], - "commit": "57c4a0fac36a26cfa8d1296e76afbcf7a5b87a57", - "sha256": "1pavzlb48a7062mrv9ldfwh1fl7pbhwy1i4j24lgmynbnv1kk96n" + "commit": "4a264ffed9dae7d04ce1c72b07c9566b4bb8b6a6", + "sha256": "14h7idc160w38h82r4q1cq9rcbaw73dpqrxmp905wvnkvbncwhdk" } }, { @@ -93357,11 +94117,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20240326, - 722 + 20240624, + 1829 ], - "commit": "893a401db7d3b93e977b3c2608169dbb6e3fbdce", - "sha256": "1fh36w8iyrh5pqrfrcrh0f6clrmin5vg7r7hcg70z8s6w08ylzfy" + "commit": "3319c309f6fb0b0771363bec80557bc387243a82", + "sha256": "0iq63n4r78s4v75iadaqk06m37pg3allzrrdz2r1x3pm3br24nz0" }, "stable": { "version": [ @@ -93452,16 +94212,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": [ @@ -93951,11 +94711,11 @@ "repo": "phillord/pabbrev", "unstable": { "version": [ - 20240216, - 439 + 20240617, + 1622 ], - "commit": "bf8a498f2ddd268981d43fb71cf98aa2e4be3942", - "sha256": "1ilj6zm85hq95xlnx6b7sbzxdrkk5pdbcnd26igmy6z0z3br2kl3" + "commit": "d5f120c523ddce2e8dea1868150248cd188d8ad8", + "sha256": "1givc7d5wvq1chfbi2rdkwn36jfvdm930qzy5gzyav1ywdcm5sis" }, "stable": { "version": [ @@ -94066,14 +94826,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240415, - 1547 + 20240628, + 1901 ], "deps": [ "compat" ], - "commit": "d9ce37b82529827ce720ad3ccf4af887d19fcfb0", - "sha256": "1hnv0yjc0yyjcp369z9nlvyxiqmzs0zqz5g6ly9cc3g43bjfavbj" + "commit": "33221b6a0aaf4d7648b50afbc66b5691d90b6924", + "sha256": "0321sx2va3r3paivv72s45pnw26n02silhk8f43hkw0il46d07vl" }, "stable": { "version": [ @@ -94204,36 +94964,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 +95146,19 @@ "repo": "danielsz/Palimpsest", "unstable": { "version": [ - 20200804, - 2308 + 20200805, + 1048 ], - "commit": "5310c4a026954254ab82e5f3fe9f98dde2bb5c8b", - "sha256": "191d4x7fk5kl30fcgzfm6xn4mwxfpx65p5811ybyxci3rddd8al6" + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" } }, { @@ -94513,15 +95251,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 +95420,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 +95504,26 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20240415, - 1547 + 20240618, + 1837 ], "deps": [ "compat" ], - "commit": "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7", - "sha256": "17r70dwlg23kpv2dx4j7bs3pshisgz1j8k70vv3izyq0qg0n6vlp" + "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff", + "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "compat" ], - "commit": "8b575bc215e715525644ed66152a9bcefde3bd08", - "sha256": "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba" + "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff", + "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v" } }, { @@ -94820,26 +95558,26 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20240506, - 816 + 20240625, + 740 ], "deps": [ "track-changes" ], - "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", - "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" + "commit": "7f7fa030e3ca51eb0a060df2694cbab2eb3b27b7", + "sha256": "1rdwzsgwv50dy4rqnydwlaihvv6fdg2sysig571f0sh049in8iqq" }, "stable": { "version": [ 0, 9, - 0 + 2 ], "deps": [ "track-changes" ], - "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", - "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" + "commit": "a96c768e9dc4427c9ea18812a2f09e209a5e1a5e", + "sha256": "17kkyqkn0r3s2rbgc6v5jygrq5bm5jcw54byjfkhnif90zvdch0n" } }, { @@ -95531,21 +96269,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 +96340,10 @@ "repo": "joddie/pcre2el", "unstable": { "version": [ - 20240220, - 1530 + 20240629, + 2322 ], - "commit": "380723b2701cceb75c266440fb8db918f3340d50", + "commit": "b4d846d80dddb313042131cf2b8fbf647567e000", "sha256": "0h73d9f1zj74vjir2kiq4s2g5rai7b59z7da20kh862xnldfcxsx" }, "stable": { @@ -96003,11 +96726,11 @@ "repo": "bram85/emacs-persist-state", "unstable": { "version": [ - 20230728, - 714 + 20240703, + 2100 ], - "commit": "0b0dd8dca90414db3395860c2bf32a4c736acfb4", - "sha256": "0ib6racii2wrpf9j63bi29r2y54dy7hhwj40ys74isiysk2r8x07" + "commit": "2d3d81717fbb2fac26362e8308f33d589818d7f0", + "sha256": "0kv05j8zi8msnx9ibw923c03z9bx8ckhvxf7sxazdlmf2clxyfkz" }, "stable": { "version": [ @@ -96356,21 +97079,21 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20230906, - 46 + 20240713, + 1406 ], "deps": [ "f", "map", "seq" ], - "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a", - "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds" + "commit": "a3c74988c2ae89695026e6d314b5eb27c35fbc3a", + "sha256": "0dsyr2w5md86w8kpf8y2qk5rgsy58abza4wm1fb6k7rxfbds16p2" }, "stable": { "version": [ - 2, - 0, + 3, + 1, 0 ], "deps": [ @@ -96378,8 +97101,8 @@ "map", "seq" ], - "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a", - "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds" + "commit": "2041ba1caee94242362c955e697a3c03bfbc0402", + "sha256": "18mz7nhsii9l1iqa9yk97xbf6dn4mladwrnl5w7ksa2zcpcpph61" } }, { @@ -96414,25 +97137,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240520, - 1322 + 20240710, + 2114 ], "deps": [ "peg" ], - "commit": "0f20a0051ab898ea53903284c47a4703555380ca", - "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" + "commit": "614becd4182d2411e17acf4f88918d7c5df75548", + "sha256": "0bi2sh6901ylwgy9znv10j5vd3hgryvx3hc3yijs67n41qf4zryi" }, "stable": { "version": [ 0, - 34 + 37 ], "deps": [ "peg" ], - "commit": "0f20a0051ab898ea53903284c47a4703555380ca", - "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" + "commit": "3d16f2e30e3dc2ec5c283d80f58730bc8ef4d6cf", + "sha256": "04zhy0wp6rk5x55ja5danyf3rpb59k35lpw7b07bn25rngmqjmid" } }, { @@ -96786,11 +97509,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20240118, - 1458 + 20240621, + 742 ], - "commit": "f0a14387427244251883889ba616c7f042323f6d", - "sha256": "1r3vgzfrq87ffp7g0xx44iwjpakcp23fhd5cxbbnwvia0y49vv8l" + "commit": "4792988a120d6ac515ba16605278d04cb8be0d69", + "sha256": "0w9amslw2hpf0znfmn4cki3c6xqxjs11mayvzqiycfc6pabw4hzq" }, "stable": { "version": [ @@ -96898,8 +97621,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20240407, - 1500 + 20240527, + 459 ], "deps": [ "async", @@ -96907,8 +97630,8 @@ "f", "php-runtime" ], - "commit": "1916e35e08d746a6ff8a2cd88ae43bdb6842feab", - "sha256": "0c9diqgy8v0bcx5011z2sd0q7s2xn2f4y7mpgv0x5fi0qh2a1mw1" + "commit": "6b5269ff82785a9bd1e648b2f91e5128353d5a67", + "sha256": "0ygnl1xpms8cnp5s7i9ng99azyzg0k3h830mazkhhpwlqhkjffyl" }, "stable": { "version": [ @@ -96932,16 +97655,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": [ @@ -97393,14 +98116,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 +98304,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20220802, - 1951 + 20240531, + 1602 ], - "commit": "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067", - "sha256": "03rhhmwwigvych4qfn0hly0z2hihs57yjapvfinbkrmw8ajgnl01" + "commit": "8ef396d8fa9187b65c065a6bc2ca15dfaf3255df", + "sha256": "1p5xgq0mnyqxjmapki60xv1jns0pxszd04r0c1kdyk1bcdcpjm93" }, "stable": { "version": [ @@ -98115,8 +98838,8 @@ "repo": "alphapapa/pocket-lib.el", "unstable": { "version": [ - 20240407, - 2247 + 20240713, + 1324 ], "deps": [ "dash", @@ -98124,8 +98847,8 @@ "plz", "s" ], - "commit": "b13c899223a15481738c3105f07ee2205dcc937c", - "sha256": "0b5451fwsjqb603mmgw6kpd8w4gvndg3fxbdb44ib2245ynr5mms" + "commit": "21f69179ad254ab64cb876115719e5d7d043f88d", + "sha256": "1hh987aflyjjddinx790g09c6l5yfd2wbihh83pvmrair6pj68rd" }, "stable": { "version": [ @@ -98406,8 +99129,8 @@ "repo": "mavit/poly-ansible", "unstable": { "version": [ - 20240520, - 1500 + 20240626, + 1320 ], "deps": [ "ansible", @@ -98416,8 +99139,8 @@ "polymode", "yaml-mode" ], - "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57", - "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8" + "commit": "24a17c6b965a085c737bee857eff919dfd0f961d", + "sha256": "0k36pydhrrhzs46vcn5lsqxvz66j7nws5vfhwlh60vshkic2rfhx" }, "stable": { "version": [ @@ -98720,15 +99443,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20220714, - 1932 + 20240601, + 1617 ], "deps": [ "alert", "dash" ], - "commit": "394a52f95587b1d10d0c3bdca503d2cc876db35b", - "sha256": "1y64xs74p39rr1d4i1s0zjhqlcips9k11fr8z6wy1j7s9b142570" + "commit": "de71c34a1a9aff745181107094d3389816dbeca5", + "sha256": "00jh2hww8xpvnj9hqlgfg9rgqspwpp6nsqzjdsny96dps8myki1s" } }, { @@ -98739,16 +99462,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 +99900,8 @@ 4, 7 ], - "commit": "90a9babc829b298af36be695009894fc00a97935", - "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy" + "commit": "4889e08cf9077c8589ea6fea4e2ce558614dfcde", + "sha256": "0wnmh9a9ks0pmcjy9df5higfbz9gy1ydj4n8s84hkhd4wq4fndvv" } }, { @@ -99189,11 +99912,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20240507, - 148 + 20240703, + 359 ], - "commit": "f4e9e509ba96ceb3c2b2b054957291607fb52651", - "sha256": "0hz7jgpsg3adgwg2qqgd9vy1mhbkr3c9rsy0zx5kmn42npdcf4az" + "commit": "493b17f74ad41104d0c4d648e8c96dc495279ac8", + "sha256": "1yjpkx5h8wm5hs448hri8zvhzq44g4qgb5g1ji6yj99x8vdpf5al" }, "stable": { "version": [ @@ -99615,16 +100338,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 +100574,28 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20230524, - 1130 + 20240611, + 305 ], "deps": [ + "compat", "dash" ], - "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35", - "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2" + "commit": "73deba1a4a719f740827c000cf46bfecacb44adb", + "sha256": "1p0v2rd9wiz13ckwkj77v8bpzg01cjsgfqkqqyrf1hkv7b0ki2z9" }, "stable": { "version": [ 0, 3, - 2 + 5 ], "deps": [ + "compat", "dash" ], - "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35", - "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2" + "commit": "3a61852dd01c738dc18b88a7be524db67a2d5520", + "sha256": "1p4vqyc4jm0pg4999i0k04pl0sa9nhrczxf4bng4id1r19sxm6dh" } }, { @@ -100678,8 +101403,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240517, - 2023 + 20240707, + 1857 ], "deps": [ "compat", @@ -100687,8 +101412,8 @@ "project", "s" ], - "commit": "c6df3b19204113642ee14a87598d65c03688f0fa", - "sha256": "1f78nq135waqgkr5z9m5gxhplb2spbkap0diykb6h9j8l6g8xij7" + "commit": "9ee93e65d987cfaecaf87e74a6716d84154a698c", + "sha256": "148gdrjv6swi8garawjb9w5mnif2agl4j5w3glrz13jmagxmmpb8" } }, { @@ -100912,11 +101637,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240513, - 720 + 20240708, + 1525 ], - "commit": "55e133360c1b66b834f9ae2c4478d2c81b2d33ef", - "sha256": "00r3zyrc08j5a5np0xc6jkzvlpjxnax7dg2br8h85hk3fml2gihf" + "commit": "eca47ea8afdfcd94b4c8d88ee640f6631cfe5c5d", + "sha256": "1vr8k4s7dk5y5c7rmnparrigsih6cz9w01d8z1gmfp55adhyjvli" }, "stable": { "version": [ @@ -101024,11 +101749,11 @@ }, "stable": { "version": [ - 26, - 1 + 27, + 2 ], - "commit": "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5", - "sha256": "1n7w40wypayplykxhknm6sljzbfbm64mg1zysrjidac3hwqkxh7n" + "commit": "63def39e881afa496502d9c410f4ea948e59490d", + "sha256": "0rbbwydw97gxbbq9gm32lp9rn44safqzywk4jjdmbrq19asdxazm" } }, { @@ -101197,15 +101922,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 +102302,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 +103139,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 +103272,14 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20230920, - 1915 + 20240621, + 2114 ], "deps": [ "compat" ], - "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b", - "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y" + "commit": "3ebacc6c46e9f7de25279783001ca3fc8964d7a8", + "sha256": "0qspqx1jlpcq64d5j05xfn6xdfnxixb654pczilxp6bqhyca8ln4" }, "stable": { "version": [ @@ -102586,17 +103326,16 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20240416, - 1128 + 20240704, + 1054 ], "deps": [ "dash", - "projectile", "s", "transient" ], - "commit": "9f850e22df93812a5b109968c549f9b3dd828ed1", - "sha256": "1f5b7ffcpmry2xiphclc4vv1zqva9rrhn08fgjq8qhdq3x0i5jah" + "commit": "1ecfb4461615374aac7786a07359c2d3d561f3c7", + "sha256": "1crdx42rdqyczccl5wqxnblqrs9ijskh5zj970800lk3xhsr4kql" }, "stable": { "version": [ @@ -102728,6 +103467,21 @@ } }, { + "ename": "pythontest", + "commit": "cac44f0b664c362935aa1c6b6045a92721cda174", + "sha256": "0k2byrlr85phyy814dcd5fxpjs5pa716bd5w1kr50wfv58xayx4y", + "fetcher": "github", + "repo": "erickgnavar/pythontest.el", + "unstable": { + "version": [ + 20240610, + 2226 + ], + "commit": "5b46552a7afdd91070ac528909e032d0df5aa2da", + "sha256": "13x8gjc4zg7fwi8a7z3cwa1v5slwfw14wynkv1hdp8rmm4j5zvz3" + } + }, + { "ename": "pyvenv", "commit": "e37236b89b9705ba7a9d134b1fb2c3c003953a9b", "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v", @@ -103219,6 +103973,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 +104061,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240514, - 1524 + 20240621, + 1647 ], - "commit": "d2cff2b7f210846108875c7eccb1b5ab98bceb74", - "sha256": "0gxjm594k1i0xiavmk27z9mv9qh5q4k5h3ih198pm637k31ziviy" + "commit": "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7", + "sha256": "0g57p95zqyxcryrzcc16q6w5xv9i9y4dncqb4h7ixdgw6bcvlhqk" } }, { @@ -104513,11 +105285,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20240422, - 15 + 20240616, + 2345 ], - "commit": "9b4ab842e37eed9b8314ba81b4eac49beeea8c1c", - "sha256": "1m9cz4g672wzsf2np7lzksgxl75bc790nq51gy97qrsjbwn6gj99" + "commit": "7a5c4c86cdbf8ba6b045d5ace466e5dcb2f10db0", + "sha256": "0j9ir47ny9m0kq4da7jvmv5qf282i0imm3xwfbjyxnhmmq5nj3zv" } }, { @@ -104628,14 +105400,14 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20240122, - 2254 + 20240708, + 2119 ], "deps": [ "compat" ], - "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f", - "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l" + "commit": "e0eccd3b4b7d7bb162767d4c5a028e646437555c", + "sha256": "0pzwyrsdpsrrnchxk8qihqr8blx366yw9snrcy1l1fj9hhsks7bs" }, "stable": { "version": [ @@ -104965,11 +105737,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20240417, - 2146 + 20240626, + 1101 ], - "commit": "a1ade7985656faf00f8a6afda885e8bdf959d133", - "sha256": "01j8i1z6mf7c2g59yzx6hrd799pxk6rdq2dvsl1r0bppgi5kv8dy" + "commit": "55f9d100ef67f174c55209f8d4cef1962a9adfc2", + "sha256": "0cay4dsqrcpwml0bpsmpnx0mkprr8jj1m6a027m7dfpmhf2xlrmn" } }, { @@ -105053,6 +105825,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", @@ -106454,11 +107241,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20240507, - 47 + 20240622, + 1704 ], - "commit": "32604147643dbfebe499ea8a4b139cc68acd2746", - "sha256": "07l5c1apdck8a73z4mh3r7jpwz1c97p4i6qz1lg5ygmr1wnhpncy" + "commit": "484d9c06f0544532336ad2ac2ddf46a1a81272ef", + "sha256": "1sky9qvrycqjmhlhrd3jn2mpdgii3m9m6r48nb6m6s7pshwlydw3" } }, { @@ -106523,11 +107310,11 @@ "repo": "kopoli/robot-mode", "unstable": { "version": [ - 20231118, - 826 + 20240711, + 2007 ], - "commit": "cb12e5adcba3379a67483e268229c152e0a8405f", - "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa" + "commit": "03bd436ff88c41e9c4d6b1df865d5abb062f5e37", + "sha256": "056n3jwpnb3fgczn38hsg0vs6969rjz11dma38mip8icr20ysllb" }, "stable": { "version": [ @@ -107322,16 +108109,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 +108285,29 @@ }, { "ename": "rustic", - "commit": "716c14a2ed8f5817c09c1ff530a4980c17b44bb3", - "sha256": "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n", + "commit": "3cc337cbfdd1f09e6a18bbbe8f8cf470601a2db4", + "sha256": "1azn2m6vac8zinykzw8nhzmg16in3h4f0p6jl08sskgb6lc722kp", "fetcher": "github", - "repo": "brotzeit/rustic", + "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20230130, - 912 + 20240708, + 2105 ], "deps": [ "dash", "f", + "flycheck", "let-alist", "markdown-mode", "project", "rust-mode", "s", - "seq", "spinner", "xterm-color" ], - "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c", - "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih" + "commit": "c1893528ad6b8e8ca795b547f326ec52dacf8728", + "sha256": "001iv1ymiz0bgq14nzysyzamw46zgiap0vgkj9a3rfi68cky524w" }, "stable": { "version": [ @@ -108086,25 +108873,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" } }, { @@ -108172,11 +108959,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240420, - 1150 + 20240630, + 1733 ], - "commit": "d9424fa74acf930664c43d4c9f9625d8bfdd4d21", - "sha256": "0sc2sx3pgifcnd2zw7nvk3f8z3v1zh2q94d9rnlayvwr6y4cnlq4" + "commit": "8c4ace721fb525d1a790121a8625bc2623c9f207", + "sha256": "100zx8f57f8gdi8wmkcj38nannyzgpybc63jzs466c61f7li5wjg" } }, { @@ -108685,6 +109472,25 @@ } }, { + "ename": "sdml-mode", + "commit": "3ef7d39f3984edd3e50db8fe36ea496aec844648", + "sha256": "02ja7qa98r8azdkgbiqc8vg8lyba7qhqm2ng0aia739bpxqxac97", + "fetcher": "github", + "repo": "sdm-lang/emacs-sdml-mode", + "unstable": { + "version": [ + 20240708, + 1403 + ], + "deps": [ + "tree-sitter", + "tree-sitter-indent" + ], + "commit": "33e44bfe8fddefc16538407d55da3ca85cfc1a6d", + "sha256": "1nv97ffwvaqgh2vycm0cgn1nra6qyajl25fwx1kl0psfb3k7kfiv" + } + }, + { "ename": "search-web", "commit": "1f1a3697649ccf69c8eb177c31ec4246b98f503b", "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36", @@ -108944,14 +109750,11 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20240427, - 833 - ], - "deps": [ - "visual-fill-column" + 20240709, + 1942 ], - "commit": "79397e634a89c5e16de1d317f735aafe75c78aea", - "sha256": "0dwb4j62n13dg8kl2maci1668v0nsnc55xfjfva3wm5singb72zl" + "commit": "0c09d2aeb778ac3a03f2c3d99dfada9ba67e40ae", + "sha256": "0mqjgdym0nqlzrjwjmm6qzbmd51kv0z7mxxacsl3fzbwyj364g19" }, "stable": { "version": [ @@ -109104,15 +109907,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20231102, - 1035 + 20240606, + 1327 ], "deps": [ "apel", "flim" ], - "commit": "9063a4485b148a767ea924f0e7cc78d3524ba256", - "sha256": "18km8jdxjcqnh378xxd7ivvvcxzrif8zpq9zgki9i7f0q8lsx677" + "commit": "85a52b899ac89be504d9e38d8d406bba98f4b0b3", + "sha256": "13sfwv889i99l5zv10ibzm221wvwbp3m45nf4nsr0dhvln90zrjj" } }, { @@ -109881,11 +110684,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240227, - 2310 + 20240623, + 1713 ], - "commit": "03afa7339930e5715c217455f3070c88a7fac55c", - "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6" + "commit": "f3307e7ffac399e36cb70d7663181dd53caf712a", + "sha256": "1i0w4izfzggnhr99wy6nb9zkc5p31pfxn2s962kkba6r2zvv435y" } }, { @@ -110208,11 +111011,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20240423, - 31 + 20240712, + 215 ], - "commit": "1da8d4f11cc5f79bce124d0a32be59be18359373", - "sha256": "063klgl664n8qw82g7c31vsbw1npw7l2jc5n2g9bndhhq8hg5g2g" + "commit": "3c8530d29e54b64023d8c038e5046e085b052fa8", + "sha256": "1160a99djlixcxx1sh3jhpxxx96k9v2jnx7b67ar1rn5s2qc7dzb" } }, { @@ -110240,6 +111043,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 +111216,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20240401, - 957 + 20240622, + 712 ], "deps": [ "language-detection", "org" ], - "commit": "b82a174ee33f19ed96c7e8c85ec362eab147d4aa", - "sha256": "0qspg55r397p6p16c4cps547x2w7gdplshy3scr810iwphrzsvfy" + "commit": "a684fda3485684714a87b637c76b843fc15cecbb", + "sha256": "0x0x4plkmphz2qwxsv3vrgvhy2hcqbgs0aa03iqvxnyg22ih6pjk" }, "stable": { "version": [ @@ -110608,14 +111426,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 +111444,7 @@ "deps": [ "seq" ], - "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "commit": "0ac8dfa02ddd33cfa0e3cff834b68e32185db9ee", "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" } }, @@ -110638,11 +111456,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20230814, - 302 + 20240629, + 1008 ], - "commit": "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb", - "sha256": "14jmki9lrcf78g362sxjvs1a55cz99p2pvnrvvr0hnn7lh6rfd4l" + "commit": "96a142dfd5768d66b1d574027e13c572e4c82a87", + "sha256": "09nisfdlib6n94pv5axvj64znh77jsdifv55d69kb71azpjl7r68" }, "stable": { "version": [ @@ -110650,7 +111468,7 @@ 4, 1 ], - "commit": "d41255fc2b8cadfc7882c617c7d1aff71524ed46", + "commit": "452378c68b7e95b9e8244d20ace073a0be27ccb2", "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr" } }, @@ -110677,14 +111495,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 +111554,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 +111764,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20210625, - 2001 + 20240713, + 1008 ], "deps": [ "anaphora" ], - "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3", - "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369" + "commit": "90de7cb42e1dbfe295516e696df928966f1eede9", + "sha256": "19nbwrc2pg44qqryslm3mzjc3isxx1indmdxms39j71qzwgig6ad" } }, { @@ -111231,6 +112049,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", @@ -111592,14 +112425,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240516, - 319 + 20240705, + 2255 ], "deps": [ "macrostep" ], - "commit": "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3", - "sha256": "0bq0vi22mr43l64q501hkv11sp58bmn8hgxmc61if0xc1rlcs68v" + "commit": "eb30f9f7bae4f8eed27a060390ff8aadcf69174e", + "sha256": "09wz5pdgdq2md0m1z6c47sab3xxvwl897mci1axw44ny8g914f9z" }, "stable": { "version": [ @@ -112389,15 +113222,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20240416, - 2253 + 20240713, + 1002 ], "deps": [ "cl-lib", "dash" ], - "commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce", - "sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm" + "commit": "c7519a1b69f196050a13e2230b7532893b077086", + "sha256": "06bdr3vcywg6k89d5dmvj4sdxh95y0jgh5xlddvmv2x0i8d7g69b" }, "stable": { "version": [ @@ -113421,23 +114254,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 +114296,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20230227, - 1454 + 20240603, + 903 ], - "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", - "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" + "commit": "c6dbabc1b4f956e19c7e80f16e69f3d6c57b84b4", + "sha256": "1zsazml4qsbvnqb418fiknpj3zcnicl6m6x65i29ipwrjsi41i6j" }, "stable": { "version": [ @@ -113870,11 +114700,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20230530, - 1751 + 20240623, + 2202 ], - "commit": "319ad1cd6aa05dcb43e4edca50eca339892e0865", - "sha256": "1kmfmf7d5qw06y5hrfspzmds13r9ijvsh9f2fnahg1mr3a6g3bjl" + "commit": "7b06ef8fb26825e0035c70c81ac130b930d81bbc", + "sha256": "0idlbwnf4zk1sf0jqbx9r1m3j9bjsl1gzxmbsziz4xjp769y1z5b" }, "stable": { "version": [ @@ -114013,11 +114843,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240522, - 104 + 20240629, + 106 ], - "commit": "448e0e5e491e2447da2590ff216675e083d910ff", - "sha256": "160h11025fkxg734ri944l2jndfpmg9mlar0jy8aqk3bys3mc85i" + "commit": "70aa416c65bb8487f3cee6dd170b451fc489e902", + "sha256": "1kzvav066mp5i4f5y8wc6c1zy6aa3zfhhamzlw7d26j378wcb5vv" } }, { @@ -114141,11 +114971,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20240421, - 2351 + 20240616, + 2345 ], - "commit": "7f9332a299b41e1fa4da9a82669f5981f6ffd3cc", - "sha256": "19155y36mxdqrrnqw62hmysprvw1dajap1y4rcx1nr7j9xkwjs6h" + "commit": "74d2701d78c1759074566f150d96a3596072359a", + "sha256": "1fg6nyfw1hwfx8gxwkqyyy4b6hhb4nhvxpzq2zv89zqwkvn0byhc" } }, { @@ -114288,6 +115118,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", @@ -114718,11 +115572,11 @@ "repo": "emacsorphanage/sr-speedbar", "unstable": { "version": [ - 20161025, - 831 + 20220705, + 1231 ], - "commit": "77a83fb50f763a465c021eca7343243f465b4a47", - "sha256": "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153" + "commit": "73ecfc21cf38f0cb1dfbbebebdc3cf573eccf7d2", + "sha256": "1f8gh4csg4p160r9rawm0m8xgdyskarhnmdsly46f6zci3yc35z3" }, "stable": { "version": [ @@ -115056,8 +115910,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20231202, - 235 + 20240523, + 326 ], "deps": [ "compat", @@ -115065,8 +115919,8 @@ "s", "spinner" ], - "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79", - "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d" + "commit": "17c3847566447e2a860d5837d35380160276bed6", + "sha256": "0cx256mxn6s0nz7cgmc7iadqshj3flmhzc78v61ci21r999j3kpz" }, "stable": { "version": [ @@ -116120,11 +116974,11 @@ "repo": "matsl/sv-kalender-namnsdagar", "unstable": { "version": [ - 20190421, - 1521 + 20240620, + 1416 ], - "commit": "fff970f49c77abfc69e37817f25a939818420971", - "sha256": "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2" + "commit": "743aa9eec1364fa4194e11f7f10c29688cdd636b", + "sha256": "0mliqsd5s5vb229kn7813vq5crg1wlbbyjkkvq6841sk6y0x2mjn" } }, { @@ -116180,14 +117034,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 +117332,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 +117362,11 @@ "repo": "rechsteiner/swift-ts-mode", "unstable": { "version": [ - 20240414, - 949 + 20240603, + 735 ], - "commit": "a62f4d84b836fe208d912c26fb561c93a0c8e296", - "sha256": "0zzx8fg17vzh0r8ln884zg2kd7qj1bn9mnnvcr4fiv0x4dc16sgg" + "commit": "5e198d306bd4d49e4dddab39195fe99e1caf8892", + "sha256": "1amxdcy7f8ixs7wq5jrmd8kca5a5vdijfv9jlz6ffvl3wqb01c3k" } }, { @@ -116858,11 +117712,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20240517, - 819 + 20240701, + 849 ], - "commit": "bfebe73b1322cdc32353375b55f5f56aad85fb57", - "sha256": "0gnmqw3gdgjqb0vfzl2vi3zvk89mnx2yxq8sdz7rn4y8hbyxsmh0" + "commit": "9664a1338b5755fe811eddd59f20a64a23da4063", + "sha256": "172hnb2jgc5z3c89sdb3jnif4lwisrj7yanr2kl418mg61ngm024" } }, { @@ -116899,8 +117753,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20240418, - 806 + 20240627, + 419 ], "deps": [ "evil", @@ -116913,8 +117767,8 @@ "tree-sitter", "tsc" ], - "commit": "db8ac5b3039b91e28d4c403c98fcb799ec94369e", - "sha256": "065njm2610vhvsg1f0pm7ri51fp93f8234in1p791iqmmykdk7jx" + "commit": "6ef879ca83c111a0863c71dea29461138ae6331d", + "sha256": "0ypsk3k3s3y302zygm0im2g2cr7l753yn5ymr99rkzli629framz" }, "stable": { "version": [ @@ -117572,8 +118426,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20240426, - 516 + 20240629, + 1347 ], "deps": [ "dash", @@ -117582,8 +118436,8 @@ "s", "transient" ], - "commit": "06804c5fea50d79de458a99699a16adaf3c52498", - "sha256": "1k9qv7w9065j4k601yy5jk0ypx5vk4ji6viv61ss9z1b1fq37yiq" + "commit": "64b1556e5acd165112827e4219d29cb0f5d24c7b", + "sha256": "1r7n1ksjvxi8gpk7a5s4vblxm6hrsc9s6gmfgn37wykxfmdad8yb" } }, { @@ -117716,11 +118570,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20221011, - 1012 + 20240703, + 1443 ], - "commit": "30495d1ab1df6213ecac008c599b91e6f9244c12", - "sha256": "1qdz7nf4wqv58ck02ralp7l4an1ashh1bnjgqkp444as3vyli2c4" + "commit": "e042de79ba009a55aeebe30aafed01234c925be2", + "sha256": "109g4w47bx17rpl4n96bcx254xiai89gbi4j89yhzf5cbldmj764" } }, { @@ -117761,11 +118615,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20240426, - 439 + 20240615, + 517 ], - "commit": "af5926c53aebc591f1c77eb8ca8ff1ea9a73eaa5", - "sha256": "1jb2klplyngmv6pl6v39y0072hqgpgs22i7yk3097kbxv8llmk5c" + "commit": "cd8ac4aee9fff55bc092ce78d93bd40517fa2c2a", + "sha256": "1r27zvymbgq50akhj6l7s1aj0sz81a375lxdhl8cl9jg74w31i6i" }, "stable": { "version": [ @@ -117800,11 +118654,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20240112, - 1656 + 20240710, + 1449 ], - "commit": "70897b621ab541dc4b7874a55378aa5a75095e2e", - "sha256": "1g5lpl8jr58c225rhvjjzrnarv30n0f3xk58srrqwzrcdvqzywmm" + "commit": "db698431a55bb68b8d756de3be7fe4a235ccf55c", + "sha256": "1ndka7dmf5p01nwz72r4cs3npl7zv3hixz6kwyf324n9xfar79z4" }, "stable": { "version": [ @@ -117991,16 +118845,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240515, - 2217 + 20240527, + 606 ], "deps": [ "rainbow-identifiers", "transient", "visual-fill-column" ], - "commit": "3d2e5ee323366906b00d8ed40e818d41e82b73e5", - "sha256": "117mck96hd0ai0ra7kv8kv78v88vms55ac64dqbrqndiwna4c6sl" + "commit": "58b4963b292ceb723d665df100b519eb5a99c676", + "sha256": "1q3ydbm0jhrsyvvdn0mpmxvskq0l53jkh40a5hlx7i3qkinbhbry" }, "stable": { "version": [ @@ -118080,14 +118934,14 @@ "repo": "caramelhooves/teleport.el", "unstable": { "version": [ - 20240501, - 740 + 20240712, + 1820 ], "deps": [ "dash" ], - "commit": "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9", - "sha256": "15kns3478xvwnn0dl883swh7x7k043b71zrv3gk0jazh60vn3q6j" + "commit": "bfdeb5c5e89665cbce24a1d04fc6cf62835bd18f", + "sha256": "1as20k8fg4wspa4icfpx1mc76j9lgqdh7qvb0jwaikq9cm7s8ls7" } }, { @@ -118131,14 +118985,14 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20240216, - 1543 + 20240708, + 2120 ], "deps": [ "compat" ], - "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6", - "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5" + "commit": "51eff558b986aa80e816bb00fbaf310f03f017c0", + "sha256": "18rbkzvd0c6dnbgggy6lvgv0baznkzviz2738ixa3y3b8mws4333" }, "stable": { "version": [ @@ -118194,6 +119048,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 +119086,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 +119286,14 @@ "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230727, - 2308 + 20240602, + 2356 ], "deps": [ "dash" ], - "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", - "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" + "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f", + "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96" }, "stable": { "version": [ @@ -118443,14 +119316,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 +119346,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": [ @@ -118829,15 +119702,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20240519, - 1747 + 20240604, + 1943 ], "deps": [ "projectile", "toml" ], - "commit": "2b836e5f954059210b6efaecebfe5fd7c72e726c", - "sha256": "0f62xly0pvsfqnkzm0yfflbd54mljbfc6jzp8kqk8w8598j548ak" + "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0", + "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw" } }, { @@ -119322,21 +120195,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240519, + 20240707, 1631 ], - "commit": "8baf3aed99934494267647ee8f309f9d712d4325", - "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" + "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003", + "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2" }, "stable": { "version": [ 2024, - 5, - 20, + 7, + 8, 0 ], - "commit": "8baf3aed99934494267647ee8f309f9d712d4325", - "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" + "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003", + "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2" } }, { @@ -119588,6 +120461,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 +120952,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20240113, - 1729 + 20240624, + 1512 ], "deps": [ "dash", "org", "transient" ], - "commit": "e756a345d213d93fbb965d1314c4dec62566c653", - "sha256": "18hnpmbbmn939s0z0ynjxl3fkgg9xzpj82rvks81xvv8nf19wfsx" + "commit": "205c730a4615dec20ea71ccd0a09479a420cb974", + "sha256": "11hgxg5q84ql9hhcz5wiqsx4hd6s2mrvzvl1axh6l7li8mji67r7" } }, { @@ -120140,6 +121028,21 @@ } }, { + "ename": "toggle-term", + "commit": "e93a5811bdce0beeacc539b702ca4afd53508fda", + "sha256": "1i37alcpsziyidxzm6dvcc29gd6fbminhj1sq7xmwrznpl4ja1m1", + "fetcher": "github", + "repo": "justinlime/toggle-term.el", + "unstable": { + "version": [ + 20240616, + 722 + ], + "commit": "d17596b8ed52e6a2f0c7f6754ee6fa233d28c146", + "sha256": "041p36p0g0qpdfhwh9b1zy0lp2m1w8f3zk9z7m8cpdj87ddqva45" + } + }, + { "ename": "toggle-test", "commit": "8ea51a54b745d9978c5177182cd8501912aa2d01", "sha256": "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1", @@ -120286,6 +121189,30 @@ } }, { + "ename": "tomorrow-night-deepblue-theme", + "commit": "5de4420ac32b3f10b7ab5a5dff2c6a7a8f22aeb2", + "sha256": "0bzg8m0bqmgvfhz4xcrpsiy7wfbls1sq6fjh2yj02nnfmkgzqcs1", + "fetcher": "github", + "repo": "jamescherti/tomorrow-night-deepblue-theme.el", + "unstable": { + "version": [ + 20240712, + 1635 + ], + "commit": "5359e32f641ba4f2d596999d32a702182a1add73", + "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "5359e32f641ba4f2d596999d32a702182a1add73", + "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp" + } + }, + { "ename": "tongbu", "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80", "sha256": "1gnjvb4w0mgr0swpqqk3hmscypv9bdg9q2ixkp2sv19d45gd4pvb", @@ -120747,28 +121674,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20240509, - 1849 + 20240629, + 1508 ], "deps": [ "compat", "seq" ], - "commit": "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e", - "sha256": "1vrnxd95dmf6v6nzvzcf4nxz4sag9qwl1hj2ciiffl2d420shjsh" + "commit": "32b7a99bf25fbf43fcc6efb9712a2c0888edd3eb", + "sha256": "0xjasyipbw1sx1yy81ywdqmz8pmngmyc50n1pacyys771zd96dxq" }, "stable": { "version": [ 0, - 6, - 0 + 7, + 2 ], "deps": [ "compat", "seq" ], - "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", - "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" + "commit": "2d6fae0ca232c2423facbbbf8ece18c856e7d31d", + "sha256": "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989" } }, { @@ -121044,28 +121971,28 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20240415, - 1549 + 20240618, + 1838 ], "deps": [ "compat", "transient" ], - "commit": "1ce8c7c74dec199e1045fec3c79cb9ff433b1735", - "sha256": "1b1i5hb9r8z6r1npbip8swgfizdkhwl1x5b6b9k9552i6gxm1qbz" + "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea", + "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "compat", "transient" ], - "commit": "b8d48c81de06261926420d75608cc69f99970563", - "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr" + "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea", + "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw" } }, { @@ -121205,14 +122132,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 +122150,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240519, - 717 + 20240707, + 727 ], "deps": [ "tree-sitter" ], - "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", - "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" + "commit": "b2739d07fadf45520a25862342a1790cd905cff9", + "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk" }, "stable": { "version": [ 0, 12, - 196 + 204 ], "deps": [ "tree-sitter" ], - "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", - "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" + "commit": "b2739d07fadf45520a25862342a1790cd905cff9", + "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk" } }, { @@ -121253,14 +122180,14 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20240210, - 343 + 20240531, + 2321 ], "deps": [ "compat" ], - "commit": "2d6c69cb7798a8cb7fcf9923c4580220dd48b3d4", - "sha256": "18winxkh1934jr19prp2yxlnl2vgh1yhrrvy1flg0l2r2pb5zrch" + "commit": "b0a5d1bf924d8cadde5bae50b8d9ac131279b828", + "sha256": "0smcnpmchm6kgxbdirfw6y17ad4innppab4xzpvvnixhnqbnr655" }, "stable": { "version": [ @@ -121319,8 +122246,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240518, - 932 + 20240613, + 2014 ], "deps": [ "ace-window", @@ -121332,8 +122259,8 @@ "pfuture", "s" ], - "commit": "923fbbdea57b27ed3293079b13846206add85d9d", - "sha256": "1dw8igrag918c9s2pz80nmri09kxay10v617zafg91kdqzpnwgyy" + "commit": "54ef590b7621032a76f8f3e307032fc13c802371", + "sha256": "116qwsyvb105in31f62an3zvsfah8ncl8bwh2hw0kwbvnrm387vk" }, "stable": { "version": [ @@ -121674,6 +122601,21 @@ } }, { + "ename": "treesit-ispell", + "commit": "08692fd0e799bbe2afe086e5fa146628cd97bdc1", + "sha256": "1dnzmw3vr59l7n2rryf6w4sfx9vay1626cb62yvk3zjxl2kpn0wj", + "fetcher": "github", + "repo": "erickgnavar/treesit-ispell.el", + "unstable": { + "version": [ + 20240611, + 117 + ], + "commit": "56740dccd5a72277fa05f19491e032e0c4701ad2", + "sha256": "162q3i1c8v6k8zzbwfm7h6yn4w0r1xvw9039pn3z7widpcz5mczw" + } + }, + { "ename": "treeview", "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52", "sha256": "18df7xpz42z408784w0s39hwp5pxrramzrbk7zfbr4qrnxnk0bva", @@ -121709,6 +122651,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", @@ -122278,11 +123243,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20240507, - 617 + 20240603, + 630 ], - "commit": "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0", - "sha256": "1f2sba6ld55w6mdbwwz4kqfp2rsgmbdm88apxjfglsa5nlh7g50b" + "commit": "5bb294411ff06ad40186bb7ca141fdbfff902e09", + "sha256": "1gspkch0dv9fx22n1sp0yq0qj61lg43hc1n5x0nz8mzy6bxc6bsx" }, "stable": { "version": [ @@ -122612,14 +123577,14 @@ "repo": "crmsnbleyd/uiua-mode", "unstable": { "version": [ - 20231219, - 1706 + 20240711, + 852 ], "deps": [ "reformatter" ], - "commit": "24115f187212a89e600dfb870fc34880355846ed", - "sha256": "11lagjk8vwbls5dxqfcrrljn82f0rbljn9x4fz0sf96svja8j2va" + "commit": "20344ddaa401ed172e4b3649076ae33c117918a0", + "sha256": "0qnnwkbgx013zfiihw5lfahmqbcp8ic8d03a7z1d3ic5lx439phh" } }, { @@ -122814,11 +123779,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20240422, - 6 + 20240707, + 1410 ], - "commit": "d935af2c57ecfa14248a70b3fe8a84fb78fef209", - "sha256": "1zy4sxllmh0qa876qnc4h89f5fda3vcrgs4xpy7y1bgbfcpwks0q" + "commit": "dbb3e4b699dd488497ef9b32a04b8e928a6bc8ef", + "sha256": "1f4vsg68fylcp2cqc74mbw4zls3n0zq8wvyd0vahy9km7fr753p4" } }, { @@ -122829,11 +123794,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20240421, - 834 + 20240709, + 1418 ], - "commit": "75d78310c86901f01b35d47f3ac1a5c8368abba4", - "sha256": "0ywyjg8zpa8dzz6sw5zvzfck44iapr0iymmpbxh4ymli663fmw9p" + "commit": "ae94c87b3f6f0ac0639005f506762866e65dcf9a", + "sha256": "1irqs9sl0lsjkwxknv54nkwcrq788hz1h4jmh2xx1xn25gfh7nmw" } }, { @@ -123549,6 +124514,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", @@ -124749,11 +125743,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240426, - 2014 + 20240708, + 2311 ], - "commit": "24784e7a81a937b4b294a2a57238999c53d6e5d1", - "sha256": "1z47qjhb427hrdmpxmjq4h5q20lzppy35im46dl5m3yzvx3k5aha" + "commit": "8a2d425ea7b2287090d6464c05f24b8894cfd09b", + "sha256": "1v9hsqnfah87zgxpl21867k1lh9ljazjsrdid60qr6s4hxjjn97m" }, "stable": { "version": [ @@ -124944,14 +125938,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20240327, - 1013 + 20240625, + 1023 ], "deps": [ "yasnippet" ], - "commit": "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4", - "sha256": "03zba07d7d1c96ygkw1779v9ybnaap2668ss5w92zfzc8b45yvdr" + "commit": "4d3019e72a62dcbfede3d4812c913d5e6210c488", + "sha256": "0kxx08nl39qs35i086lxmh8kw8ljl7npi86djpr7ksl6p3sx5m7k" } }, { @@ -124962,14 +125956,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20240511, - 2047 + 20240708, + 2157 ], "deps": [ "compat" ], - "commit": "ba650a7ab90d66686ba787937ac9e71f749c598e", - "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" + "commit": "c971c5106b2ce001b0d263683aa51eaaf7606e10", + "sha256": "0pllcx67l5wmb8iyj6ilam3m26qdm9x7cpb7qygsdda3am3grn6h" }, "stable": { "version": [ @@ -125252,6 +126246,30 @@ } }, { + "ename": "vim-tab-bar", + "commit": "bf6f8f47c5cab38b0cfb0a5bd3f4b02cc4968f3a", + "sha256": "0v103a25ilc3hkh5n15rw5a2gs6i3m35cazsw5fd77756s5ix44l", + "fetcher": "github", + "repo": "jamescherti/vim-tab-bar.el", + "unstable": { + "version": [ + 20240710, + 1928 + ], + "commit": "1fec194e7890135c5e06b61a31c78612eec3b546", + "sha256": "0gg6wc4cz6g49h356l3ks3hgx3pvlbf976gvl0585c88f4rwvg4p" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "commit": "ba0d914f725db86c67ddf0469d3f34fdd0f4f2aa", + "sha256": "0nahsm1pynsipq0ym2p73rxc90i0sxsj86an207h8d2ag7j37kc6" + } + }, + { "ename": "vimgolf", "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b", "sha256": "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f", @@ -125685,11 +126703,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20240521, - 2336 + 20240605, + 134 ], - "commit": "d0d9fb57582677fc1f9a4a1467ec3f6470aff0d6", - "sha256": "03qy8d7vbnkx2ssfby7kgdjmz691rqw4vlikhpb37xkmhsqa0w0d" + "commit": "351300bad1a28f5e86f39f6fae9ca5d8a0cfb24d", + "sha256": "1jhczlfnw00iqkyb0952fj330wn0ipa9hiyhjc7a3g1c2swp9mql" }, "stable": { "version": [ @@ -125708,11 +126726,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20240521, - 2340 + 20240605, + 133 ], - "commit": "bc0250f261c066f576fa13112dcfbb10a4e5c6ef", - "sha256": "1ys5xhll909zfx02hf2gqbwcf3jcq83b5xxvajrr6xxqwa4mk9h3" + "commit": "5eeb6e5df24172497c844da750697b2ca3b750fe", + "sha256": "19kizkrqpw7m18pmfr4gi3pzxmkf9vc900z10079crrdw90lqjs4" }, "stable": { "version": [ @@ -125785,11 +126803,29 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240520, - 231 + 20240705, + 1533 ], - "commit": "df057b1af2bb89a1deb288086f13be296af42090", - "sha256": "11j89pldhmw9v2g1sqcg4piniijz4wzgmim1jv46iwnaiwzw20fi" + "commit": "d9ea29fb10aed20512bd95dc5b8c1a01684044b1", + "sha256": "1q62yav93i3485iy7d4v1y00s0zyc0r9v06xb9r49rw70j6x4vmf" + } + }, + { + "ename": "vterm-hotkey", + "commit": "16c2db3a88115057c3ca6814046c3b63ef4fd00e", + "sha256": "1w0a7rzgws43i2hm2pgmcx5kzd7g4y531s7c761lb1dvf6a94s9d", + "fetcher": "github", + "repo": "rootatpixel/vterm-hotkey", + "unstable": { + "version": [ + 20240702, + 1445 + ], + "deps": [ + "vterm" + ], + "commit": "039033a4c30dabca625d6924d1796bb9e13d85c7", + "sha256": "15xgb48q3jhhxn2il9bvldmsd8y0ffsc2ccjv1sf4xks7csj14l3" } }, { @@ -125929,8 +126965,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20231113, - 717 + 20240712, + 1635 ], "deps": [ "dash", @@ -125938,8 +126974,8 @@ "org-roam", "s" ], - "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a", - "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6" + "commit": "c9eadce7fc85eb170d6319088d021a07f1218521", + "sha256": "14c2dkwh3q4nkdk8g22hs0ija22546gx9gwi13mj6nmrc34dyba6" }, "stable": { "version": [ @@ -126044,11 +127080,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20231023, - 653 + 20240712, + 248 ], - "commit": "55baf2bcb1a583d3baae1d37ad0e17b0480ffd02", - "sha256": "1vqr7bmairp70lrx9gm80w7qr2jxiijg5w1na36k7if4wikfg4kl" + "commit": "a3dd9b16224893ef1d75ee9bf0c2b088bc2a5d92", + "sha256": "1sb2p0gxb8z9im0h5pky0fhvcxjhajsyd1gicfnhl8cqxmjjf907" } }, { @@ -126121,11 +127157,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20240203, - 1221 + 20240623, + 653 ], - "commit": "25fb775178d16decb818b75f32fd23301c0f5da0", - "sha256": "0l8y0xinbh3l7d7klwvxrrc6q9zp51x7p8brapx56knh819w1bvk" + "commit": "1c5b2254dd72f2ff504d6a6189a8c10be03a98d1", + "sha256": "00qv6b756qiaqrmfg1w03psnsdj0iaz3sp50ib4kmdm2g9vgxl1s" } }, { @@ -126803,14 +127839,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 +128269,25 @@ } }, { + "ename": "whaler", + "commit": "b93a326420601a67a932315566b6bb6f25091800", + "sha256": "196qna6zrvsjy4x5f1i034a30b6935wmaklzdlgvadd1cz24nr94", + "fetcher": "github", + "repo": "SalOrak/whaler.el", + "unstable": { + "version": [ + 20240609, + 1850 + ], + "deps": [ + "f", + "ivy" + ], + "commit": "18791f9b5cfa05f7eabd686d572fa37f210ebe85", + "sha256": "0gjc9hqq1wz2npk2gw8nfkg2ikfhl3bcmlc0d3jzlpizc9mk6w7f" + } + }, + { "ename": "what-the-commit", "commit": "9af2c90af887e37c080a4a70e84ec5691c599d94", "sha256": "1lzafqw6j4xc7y8vg3q84wc1xxhc6z39dlw1sjs2vwnm9xzjnkl4", @@ -127255,11 +128310,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240501, - 1251 + 20240620, + 2145 ], - "commit": "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a", - "sha256": "01g5fgrbdgzh302ah7pqdrf98hxgah40140jjwfrx3mwcdicj7f1" + "commit": "ed389312170df955aaf10c2e120cc533ed5c509e", + "sha256": "084alfpigq5jdsdr7qh47xl3b8bwqv2ncm4df4gry1hxzpjrcjsw" }, "stable": { "version": [ @@ -127462,14 +128517,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": [ @@ -128082,26 +129134,26 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20240415, - 1558 + 20240702, + 1952 ], "deps": [ "compat" ], - "commit": "1b4526453ef6bdee30635f469aa26085c02b1ac1", - "sha256": "1qv84lg4g4kihv53vrklm0rmh9hqiwk23bynldiwvmiq39fqasyw" + "commit": "6c9a51b72fa7f454a5a123f738a6a067972eca4e", + "sha256": "0y7k3qb53mcy24z3hdmkvnmy0fhnkmsli1b686bx605w2ilqqdif" }, "stable": { "version": [ 3, 3, - 2 + 4 ], "deps": [ "compat" ], - "commit": "d5f3f06cb830311e60c58f656988ef37c05a99e0", - "sha256": "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a" + "commit": "322ee26d3a7d3d67840293041837b7e70cffa8d1", + "sha256": "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b" } }, { @@ -128237,6 +129289,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", @@ -129526,11 +130608,11 @@ "repo": "canatella/xwwp", "unstable": { "version": [ - 20200917, - 643 + 20240701, + 1040 ], - "commit": "f67e070a6e1b233e60274deb717274b000923231", - "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg" + "commit": "0c875e460d1c0637766204dc289ffbd0f2284194", + "sha256": "0a5rl4p0kywzpwmawi8cwyk47nawblan0y01s6v6vbnyb8ylcgs3" } }, { @@ -129778,26 +130860,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" } }, { @@ -130063,25 +131145,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 +131338,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 +131736,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20240331, - 1350 + 20240612, + 1258 ], - "commit": "14dda0596a7cd0750fc6566eacc203a126f136c2", - "sha256": "1cyspxwjjhflafkyb2mkcfc1227i8kzmxgz3yvrj3ykdsim9pjwy" + "commit": "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2", + "sha256": "1nzqj55nc9klvgxhd20z1n1c06v453hjxf7s70gspa4v1pwgvjaz" }, "stable": { "version": [ @@ -130779,26 +131861,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 +132220,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20230927, - 1410 + 20240613, + 8 ], "deps": [ "dokuwiki-mode", @@ -131116,8 +132230,8 @@ "link-hint", "pretty-hydra" ], - "commit": "7c62e0304750654709b4173bcc1e2681cf1fbe49", - "sha256": "1vfc48vz0ajcqcdx89wrwd3ksncwjlvi1via681d88y9in9bpbv4" + "commit": "11e077afbe21f2dd33fe7eae39c2a8345bb0b806", + "sha256": "0lc1rikrd5rhjy8p7ar649kxdv5slnkmkra6f7j00sbjwhw7bc89" } }, { @@ -131146,11 +132260,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240102, - 1405 + 20240704, + 910 ], - "commit": "82f636c1edda416794c7115757ecded64f22afbf", - "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" + "commit": "225d2628025195283170908e81341e3a8d49b022", + "sha256": "0x0cc42r56mfwi9cbyaxlnjpjv7hpkhcvn4whx545hzyr51hr53v" }, "stable": { "version": [ @@ -131200,14 +132314,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240102, - 1405 + 20240704, + 1102 ], "deps": [ "zk" ], - "commit": "82f636c1edda416794c7115757ecded64f22afbf", - "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" + "commit": "9a2ece35d2ecec20cc11e2888413a86d03beb40b", + "sha256": "14lxs2r8awp92k5ijsvw1fwiz95vc3p5md913cqka4l7hvw9x2cv" }, "stable": { "version": [ @@ -131743,11 +132857,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20240311, - 941 + 20240619, + 1639 ], - "commit": "cd7ae7400177b3c233a77c2a46de818c72375362", - "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw" + "commit": "ac3b25e250c83aedc49d1eab508142e3060e3833", + "sha256": "19aan4a2vidlr2ahsjyrlx318zqd7yyblxsw34a2hzj2pjx45l59" } }, { @@ -131770,10 +132884,10 @@ }, { "ename": "zweilight-theme", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1j8skn9hz1zkpdg7q0njv5b50cbvrixjjmkp43p58gx98q02p0kq", + "commit": "0dccf5900100571b3a17003dd471991463137c38", + "sha256": "1caqjq1ijjbnpa1jjs5am1vp9kpcfg17dbyswdfw64q698c50j3x", "fetcher": "github", - "repo": "philiparvidsson/Zweilight-Theme-for-Emacs", + "repo": "vexx9/Zweilight-Theme-for-Emacs", "unstable": { "version": [ 20170113, 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 b460fad5bb3ab..868079e037f02 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -60,6 +60,7 @@ , texinfo , webkitgtk , wrapGAppsHook3 +, zlib # Boolean flags , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform @@ -250,6 +251,7 @@ mkDerivation (finalAttrs: { glib-networking ] ++ lib.optionals withNativeCompilation [ libgccjit + zlib ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals withPgtk [ diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 487d8a3680a6d..da243044b689a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -104,10 +104,10 @@ 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="; }); 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/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/heh/default.nix b/pkgs/applications/editors/heh/default.nix index 7fd704ab6e8bb..cf36720b33f2d 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.0"; src = fetchFromGitHub { owner = "ndd7xv"; repo = pname; rev = "v${version}"; - hash = "sha256-zkb+HogwioqxZ+BTl7bcDQx9i9uWhT2QdAIXpHqvDl0="; + hash = "sha256-P3EZSe5Zv7pJ2QwKvtBh5kz93y6DBWkj6s8v3+8Xp9Q="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); - cargoHash = "sha256-YcTaLq04NhmnJ1pdbiKMRIBSFvHNWNgoAS8Uz8uGGAw="; + cargoHash = "sha256-l3XR6srs6RmvcGjMFni6wYLLqXE8mMUq59WFLKGQl3U="; 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/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index fb09af6272dfb..abaeba3d63b15 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -1,5 +1,13 @@ { "x86_64-linux": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", + "version": "2024.1 Public Preview", + "sha256": "027cac4bfab747ef97f055b63eff8a69cefc32751fcca9510c3eccaf7c36b2be", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.tar.gz", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", @@ -76,18 +84,18 @@ "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.1.4", + "sha256": "043c33371cb5fb31fdeab6deccc809189efdc6d404f771c541d4dd779adcd2fa", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4.tar.gz", + "build_number": "241.18034.82" }, "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.1.4", + "sha256": "3a12ada098a839ba3c32820071ecc04cb71e8e1066d0753397399c2e52941de9", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz", + "build_number": "241.18034.82" }, "rider": { "update-channel": "Rider RELEASE", @@ -108,10 +116,10 @@ "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.1.6", + "sha256": "42cf845a9159ab5ab182f501cb95154a27701af04ea01e309308ef6a5bb9ebfa", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.tar.gz", + "build_number": "241.17890.43" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -125,12 +133,20 @@ "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" + "sha256": "47b3323fc18e6f8c9edc71ed309b95f09385123d9b9c9492b55ad6a77b2925ee", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98.tar.gz", + "build_number": "241.18775.98" } }, "aarch64-linux": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", + "version": "2024.1 Public Preview", + "sha256": "ec59ff6e259ce0f03441e30a9d8bce8334d11c3ae858705d2f17375565adb80c", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.tar.gz", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", @@ -207,18 +223,18 @@ "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.1.4", + "sha256": "40dc15c31f44afd8ea5b42de54863253036b0d0f41b20612d0abd937e36af267", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.82" }, "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.1.4", + "sha256": "a90c657a333e1825c934d524cb426115c85d19d7aebfa4a149fda5062be29fab", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4-aarch64.tar.gz", + "build_number": "241.18034.82" }, "rider": { "update-channel": "Rider RELEASE", @@ -239,10 +255,10 @@ "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.1.6", + "sha256": "4671d426dfbf89f614c1ce367c7afba0ef64b7058b4777b72ce145715a352fd1", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6-aarch64.tar.gz", + "build_number": "241.17890.43" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -256,12 +272,20 @@ "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" + "sha256": "937c30cdfd1431bcdde10bf47f1236ea57c10eca8cd1210a04629a64b383c054", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98-aarch64.tar.gz", + "build_number": "241.18775.98" } }, "x86_64-darwin": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", + "version": "2024.1 Public Preview", + "sha256": "e90b3cc44efcabd3f31025bae506ec87da138f0a06f5cd4eaf7f96bb57db123a", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28.dmg", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", @@ -338,18 +362,18 @@ "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.1.4", + "sha256": "22558efc74b2d10fcde02650765cc3b500841d71796dba48d018fc8f794cfd5f", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4.dmg", + "build_number": "241.18034.82" }, "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.1.4", + "sha256": "99f22cba7855dbe8acaa0ec222dfaa75cea2ebe5975f1adca6c7b52c7fa763a5", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.dmg", + "build_number": "241.18034.82" }, "rider": { "update-channel": "Rider RELEASE", @@ -370,10 +394,10 @@ "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.1.6", + "sha256": "c5f079356ae9e38424be3257734b8665393146c831bddc917a4b1086321682cf", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.dmg", + "build_number": "241.17890.43" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -387,12 +411,20 @@ "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" + "sha256": "0e97d9a2ef53f18930b63a48d7303783aca7422c5d6818543f4805c01991ba41", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98.dmg", + "build_number": "241.18775.98" } }, "aarch64-darwin": { + "aqua": { + "update-channel": "Aqua EAP licensing:EAP", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", + "version": "2024.1 Public Preview", + "sha256": "29b975e6845b62ed466d26920fec4c9e5e74588b5ff5cf384d672b98bb602549", + "url": "https://download.jetbrains.com/aqua/aqua-241.15989.28-aarch64.dmg", + "build_number": "241.15989.28" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", @@ -469,18 +501,18 @@ "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.1.4", + "sha256": "63c0a14bbad81ab0c1c733802eaf86328e46ebc2de4e7bc0e240f76aefbdf54e", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.4-aarch64.dmg", + "build_number": "241.18034.82" }, "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.1.4", + "sha256": "ecfd340566f8c9ed6afcd42331568db5d91fa3a036c511ae8427f573199c3a44", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.4-aarch64.dmg", + "build_number": "241.18034.82" }, "rider": { "update-channel": "Rider RELEASE", @@ -501,10 +533,10 @@ "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.1.6", + "sha256": "5216ea7e5e994a3df4f1095772f5a44e999d7ca0ac02a21698149c8023c46893", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.6-aarch64.dmg", + "build_number": "241.17890.43" }, "webstorm": { "update-channel": "WebStorm RELEASE", @@ -518,9 +550,9 @@ "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" + "sha256": "956fc3d39a2aa34648c272780843729356a20c0a4a1ceb20e69a9f86a562278c", + "url": "https://download.jetbrains.com/writerside/writerside-241.18775.98-aarch64.dmg", + "build_number": "241.18775.98" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index af155d9de826c..b3dbbfa8f2353 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -100,6 +100,8 @@ in rec { # Sorted alphabetically + aqua = mkJetBrainsProduct { pname = "aqua"; extraBuildInputs = [ stdenv.cc.cc lldb ]; }; + clion = (mkJetBrainsProduct { pname = "clion"; extraBuildInputs = lib.optionals (stdenv.isLinux) [ diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 00b2794a139f2..d5a2a085770ab 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -18,16 +18,16 @@ ], "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.17890.24": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.17890.43": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/164/578496/IdeaVIM-2.15.2.zip" }, "name": "ideavim" }, @@ -40,6 +40,16 @@ }, "name": "python" }, + "1347": { + "compatible": [ + "idea-community", + "idea-ultimate" + ], + "builds": { + "241.18034.62": "https://plugins.jetbrains.com/files/1347/572480/scala-intellij-bin-2024.1.25.zip" + }, + "name": "scala" + }, "2162": { "compatible": [ "clion", @@ -58,16 +68,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -89,16 +99,16 @@ ], "builds": { "233.13135.1068": null, - "241.17011.169": null, - "241.17890.14": null, "241.17890.24": null, + "241.17890.43": 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.76": null, + "241.18034.82": null }, "name": "kotlin" }, @@ -120,16 +130,16 @@ ], "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.17890.24": null, + "241.17890.43": null, + "241.18034.45": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/6981/561911/ini-241.18034.82.zip" }, "name": "ini" }, @@ -151,16 +161,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -198,13 +208,13 @@ "rust-rover" ], "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.17890.43": "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" + "241.18034.76": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip" }, "name": "python-community-edition" }, @@ -226,16 +236,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip" }, "name": "asciidoc" }, @@ -256,7 +266,6 @@ ], "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, @@ -264,7 +273,8 @@ "241.18034.62": null, "241.18034.63": null, "241.18034.69": null, - "241.18034.76": null + "241.18034.76": null, + "241.18034.82": null }, "name": "-deprecated-rust" }, @@ -285,7 +295,6 @@ ], "builds": { "233.13135.1068": null, - "241.17890.14": null, "241.17890.24": null, "241.18034.45": null, "241.18034.50": null, @@ -293,7 +302,8 @@ "241.18034.62": null, "241.18034.63": null, "241.18034.69": null, - "241.18034.76": null + "241.18034.76": null, + "241.18034.82": null }, "name": "-deprecated-rust-beta" }, @@ -307,10 +317,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" + "241.18034.63": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" }, "name": "ide-features-trainer" }, @@ -332,16 +342,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" }, "name": "nixidea" }, @@ -374,16 +384,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -404,17 +414,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" + "233.13135.1068": "https://plugins.jetbrains.com/files/11349/578646/aws-toolkit-jetbrains-standalone-3.20-233.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.17890.43": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip" }, "name": "aws-toolkit" }, @@ -435,17 +445,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", + "233.13135.1068": null, "241.17890.24": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.17890.43": "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.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -467,16 +477,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -498,19 +508,50 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.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": { + "233.13135.1068": null, + "241.17890.24": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.17890.43": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip" + }, + "name": "protocol-buffers" + }, "14059": { "compatible": [ "clion", @@ -529,16 +570,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.18034.82": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -559,17 +600,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" + "233.13135.1068": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.17890.24": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.17890.43": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.50": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.61": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.63": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.69": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.76": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip" }, "name": "github-copilot" }, @@ -591,16 +632,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -622,16 +663,16 @@ ], "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.17890.43": "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.76": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "241.18034.82": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -642,9 +683,9 @@ "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" + "241.17890.43": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip", + "241.18034.45": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip", + "241.18034.62": "https://plugins.jetbrains.com/files/22407/578199/intellij-rust-241.37890.44.zip" }, "name": "rust" } @@ -652,28 +693,28 @@ "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/11349/578646/aws-toolkit-jetbrains-standalone-3.20-233.zip": "sha256-Xa+swM/llXNDTg5ol5Li25VPKZuZQYpboCnaxIQuVLI=", + "https://plugins.jetbrains.com/files/11349/578649/aws-toolkit-jetbrains-standalone-3.20-241.zip": "sha256-M4xEhew2p2fPrEuVgnrkfuWs8HYQwi89dSda5o0f9/s=", "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/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/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", + "https://plugins.jetbrains.com/files/1347/572480/scala-intellij-bin-2024.1.25.zip": "sha256-hyg9YS3XgvAxouVnn+v1+fk6kF6M6I560e9LqLVKgdw=", + "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", "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/578496/IdeaVIM-2.15.2.zip": "sha256-87U5KPVLKQ76UfXS021+lhuaWLcxGdBdZeH4l/ccFPU=", + "https://plugins.jetbrains.com/files/17718/578624/github-copilot-intellij-1.5.17.6356.zip": "sha256-oIH+bJ9ucU+tIs3m0tz5Mr2oqE6BeA4x9RjxJ95OZR0=", "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/22407/578199/intellij-rust-241.37890.44.zip": "sha256-p9A3RzGg0cTX6zgqSIX1qxlrroypIdPkSoW12leI2Hs=", "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/6981/561911/ini-241.18034.82.zip": "sha256-PdS+qm3vG4JB5J/kNc9/hsVvjO/gMl/RZTg69jCNWlQ=", "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=", 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/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 48873326bfcfb..ec1def8469773 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 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/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index ebdcac8e4dae9..94aa387ab57fc 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"; diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 451507885ce03..c3507576f28d7 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -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" \ + --set PATH "$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... 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 index d2203a714c374..bcf20e4af55de 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; homepage = "https://github.com/stevenhoneyman/l3afpad"; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2; mainProgram = "l3afpad"; }; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 2f0bfcaef7315..1aa995d880510 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ 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; diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 70ce1fe48052c..02e225a5ffe04 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 diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 333968cb89604..55fce51ac9f7c 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 ]; 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/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/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 210b90e6990dd..e2defc9f83254 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.1"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ="; + hash = "sha256-k7Pj6RVa44n+nM+ct6s4DqwpYCg1ujB3si9k0PDL6Ms="; }; 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/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/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index b07f517ea474a..9152d93c15444 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,6 @@ # run tests by building `neovim.tests` { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal @@ -43,6 +43,14 @@ let ''; }; + nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + plugins = [ { + plugin = vimPlugins.luasnip; + + } + ]; + }); + nvimAutoDisableWrap = makeNeovimConfig { }; wrapNeovim2 = suffix: config: @@ -281,4 +289,16 @@ rec { 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 '' + export HOME=$TMPDIR + cat ${nvim-with-luasnip}/bin/nvim + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ''; + }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 438c9904829c6..9f0aa86de48ca 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -245,12 +245,36 @@ let 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..98e6c9c760392 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -13,6 +13,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 +27,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 +50,8 @@ let stdenv.mkDerivation (finalAttrs: let + finalPackdir = neovimUtils.packDir packpathDirs; + rcContent = '' ${luaRcContent} '' + lib.optionalString (!isNull neovimRcContent) '' @@ -57,10 +64,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}"'' ] ; @@ -160,7 +167,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,7 +201,7 @@ let }; }; - meta = neovim-unwrapped.meta // { + meta = (builtins.removeAttrs neovim-unwrapped.meta ["position" "outputsToInstall"]) // { # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index b60b421e51466..45004d470281c 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; + hash = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index c82f3a703b223..59be19eaab55f 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -69,6 +69,7 @@ in stdenv.mkDerivation (finalAttrs: { 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 644 -T ./assets/graphics/icons/icon.png $out/share/icons/hicolor/256x256/apps/pixelorama.png install -d -m 755 $out/bin ln -s $out/libexec/pixelorama $out/bin/pixelorama diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 604758d0df5ae..6bd5786089ab2 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "poke"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; - hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A="; + hash = "sha256-iq825h42elMUDqQOJVnp7FEud5xCvuNOesJLNLoRm94="; }; outputs = [ "out" "dev" "info" "lib" ] diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index dfe977876231b..b50d505e2dbb8 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell +{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell , runCommand, unstick, quartus-prime-lite , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] 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/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 9a3ba2a4a59f4..55e737a780395 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 ]; - 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 ]; - 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.isDarwin [ "-f Makefile.osx" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3278fc9ef158f..0521d3dce56a6 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,39 +133,29 @@ 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)); @@ -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 diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index fa29fae667131..d2aabf5a92f80 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }: +{ lib, fetchFromGitHub, python3, makeDesktopItem, copyDesktopItems }: with python3.pkgs; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 30600de859b5f..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 diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d2e3013a782d9..50857ed1592b7 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.0595"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; + hash = "sha256-v8xVP1WuvE9XdQl1LDIq3pjaKyqPWM0fsFKcpIwPbNA="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 0f3652a8a7ded..663dc5b688c7d 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -5,7 +5,6 @@ , vimPlugins , makeWrapper , wrapGAppsHook3 -, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index bd526b8f6ce22..bf2fb1fb02f72 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -205,7 +205,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vim - the text editor - for macOS"; homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = with maintainers; [ ]; + 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/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 60a28dd327dbb..756c14b417be9 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-07-03", + "date": "2024-08-05", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-07-03", + "date": "2024-08-05", "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 4ada5d56b35ec..5962c50c411f2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,24 +65,24 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-05-31"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "82923efe22b604cf9c0cad0bb2a74aa9247755ab"; - sha256 = "0dh4hy62xjd8kjnmcflrsdj02b6wrakzppcawfj8r7w1nnbsmlbd"; + rev = "4a5e07185b37d3132e5541d8fa42aa874b774476"; + sha256 = "0hddx5yip9r5asm21gwrcflnlhpj07f3sp90157alnmsvmsjbcwb"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-30"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "c1dc30666c957815b012ae67e8e61de6b48ecf86"; - sha256 = "17hrsjxyr9f59h790gvwk8gmp7zzfjjsnvb5a5lpqa0q4yxq3fzv"; + rev = "ac6e91f72c43ea5b7734daca160f8072b6e98799"; + sha256 = "1hg44rg94bv1wblpghff8m4zkkprmfsjmcvm7azismpf3f71hcdx"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-07-03"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "1f603f9074118ee9975b2af0308452ca324640e5"; - sha256 = "0p9rrhlxa1dy5ym85jhr8zxai7zng0sikf5v0ywdi09vryknygxb"; + rev = "12818a6cb499456f4903c5d8e68af43753ebc869"; + sha256 = "16zdahzb3mfjpr3s6lk9754a6nqq1kjcw5p3f0qh12h6zkb2w8v4"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-07-03"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ea67d004f86ac10e29708fbb4de84f72b87df612"; - sha256 = "15pdsx91cbl4ig7ph5nbrqm42l08wbs9dvn2d80p922ywm4vjxdq"; + rev = "10ad367e4b523ccb4fe2953078d0affcddb1f1a7"; + sha256 = "1gwzjrmr0sf7nhlpviscnnsz2lfjyrxk14bgp1yfx297sb529acj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-07-02"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b606847df9f91ab6a7d0484c2e3fae096c9fe028"; - sha256 = "13whydyh7wrw0wfpbx9sn330nybbggcks5866fqpx05zdkcv1kfc"; + rev = "a86e7a0ecaf09fdb0b58ca09f34cd1e2b2b1fd75"; + sha256 = "0yidgx3z5dims64gdzvln8rji7qqbaxrg9jwbxa7w7vqhy3s7b99"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-07-03"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "e2250a99f7c3c0247d7e7456ee1bceb17aee1927"; - sha256 = "13152c34vzxpag8k6r3z0sk2mh1nyl3v76l893iwdi3q9hw8r9wr"; + rev = "f15e9ec6789c8ddb95da39f346489b26ed6193ff"; + sha256 = "0xmx1qffkl3dbqbaawdgnjs1cxdc60v0035q569bqldghfv6pv9h"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,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/"; }; @@ -532,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-06-03"; + src = fetchFromGitHub { + owner = "aaronhallaert"; + repo = "advanced-git-search.nvim"; + rev = "198cc402af1790ab26830fdbf24a28c336a20ba6"; + sha256 = "0xyhbqvbfdbd73awizn8zyq9qqrrdqpmrgdj20xv61kak5pd6ar3"; + }; + meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; + }; + adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; version = "2024-04-28"; @@ -546,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-07-01"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "db0af491ff13c18a966ce2f9ac7f5211aec000a7"; - sha256 = "0v0064c0prsxm7z151nd7fvfwq6na5agbh3dqnj9whnwx0k0l2zl"; + rev = "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6"; + sha256 = "06jg1z0lyvyq1k7hai059jj7h19r2psrya1n035ricj5j39n8i3x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -607,12 +619,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-07-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "a35fa4d732220914d620deccbc8ef68fa1bff96f"; - sha256 = "17afk45cs61zvk01kg9brl86k4czgfvsrg87zdaszw2abhxrqgi4"; + rev = "48d73c87c3c321e6298755abc5449267192d07e6"; + sha256 = "0zrwv58w4hjznjp6b4vpipamgb7ad05vv5il0xbjckxp3dq1p3nb"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -655,12 +667,12 @@ final: prev: aniseed = buildVimPlugin { pname = "aniseed"; - version = "2023-07-06"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "7bc09736f3651c10d29b82d1a465b7f540614be1"; - sha256 = "19r8kvrl8nghk9f5wdig26kj51p3dbp0g73gcvn07sjpchbb2fm0"; + rev = "9531eb0dae5a9347eda8f0fc04af7b2b7c908eb0"; + sha256 = "10qgcy29mgmdpnrdf1k9wip5glmzzhw8ikkx48p7b6qdmgfkg1c6"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -727,12 +739,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-06-17"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "ab0cb19c32181126f92b8239700cec97ba81b0fd"; - sha256 = "187glbn1lysawl4rs9rzvzqwd26yl6kkc72sabx1hs9wn3xl3x0i"; + rev = "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5"; + sha256 = "0lp8wym0ck7jfdrhwymhh1g9cas5ljmlydggy0c9qa64ildyr5ab"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -835,12 +847,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-07-01"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9"; - sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p"; + rev = "641de260966924a8ddd280af1b30209408497b52"; + sha256 = "1r5mz66qqq05wfrqg3jfd050j7flwg7gqwd03bxj4hr4dbvv0n4r"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -871,12 +883,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/"; }; @@ -931,24 +943,24 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-07-02"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7b1b30d3424b7ca0fb4d12ce3f3d1977cf7c5691"; - sha256 = "0dqq4na08bcpw2668ykcih5rw83k3a138x3a6q9i26wzmviyvkq5"; + rev = "a6e692fadbe385b28ba8e98b67747a7e2f381f91"; + sha256 = "1nlnh4ikr8mnk87694hyblrpmisc06bx1yiqrp6mv409vcafbw1j"; }; 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/"; }; @@ -1015,12 +1027,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/"; }; @@ -1039,12 +1051,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/"; @@ -1052,24 +1064,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-20"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "b67ea789efd5e81692c802d2b42629db79683da1"; - sha256 = "0j16j20psjqgl4jmzh3ajrz5zzz85fs0nyg5gyp247cka5zljhr9"; + rev = "49c0737fd76303f1294206f898680c6b9b174260"; + sha256 = "17aghspa3mdyqdxxz8726wv6kxf82bwqrp3mff4j4klmb1wxc6ja"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-05-28"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "d181f2cfd4b828f9c6f1e10e69c68241de59f54f"; - sha256 = "1qxhi60h5vy3ygm66i18122ib1xr01l8m6jn43bfav6x74jdr3si"; + rev = "53b5a2f34b68875898f0531032fbf090e3952ad7"; + sha256 = "0vzjgk5w55wbhf26dsk9m0ffdvwmkmsb3rgpwf989vbxcqmw8haw"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1112,12 +1124,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-27"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "d4ffecc3e1a34f3ed9af6362529552eee79e57c2"; - sha256 = "11k0slasxzyj1xifvlj6fy1kajnlvk5kyv05f70c7k9a3kn79jpx"; + rev = "be43be136eeab321c8cb201bf72c7db44d97b15f"; + sha256 = "04amnhxbdydl5x7h4vvirj2xj4kgv61gjqxkpc0ryk0v2w3zvdxv"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1160,12 +1172,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-01-21"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "7e86edafb8c7e73699e0320f225464a298b96d12"; - sha256 = "14srra6hx5wpr4kcvfmg0bj5zljl7lr6ahq40wnwghdvy06ck5x2"; + rev = "d337e02b140d909345441392de47a42d283747c1"; + sha256 = "02bm6kfqds02y95qqcxhy54wlw1ra6zg0p5m6x4900178r37bfw9"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1220,12 +1232,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/"; }; @@ -1316,12 +1328,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-06-25"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "81820cac7c85e51e4cf179f8a66d13dbf7b032d9"; - sha256 = "1z4i45gnh71ayqxkibd7zb07k1k9y0mk6pnldbmv73nhwi9m2ypw"; + rev = "0b2fd861eee7595015b6561dade52fb060be10c4"; + sha256 = "068gg98w88q0j3c1wrlggsp0986yppa8vlbnzy7wy4g7kn0aqfsn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1340,12 +1352,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/"; }; @@ -1400,12 +1412,12 @@ final: prev: chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-06-17"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "156372cb7485a49b02229bd1e3d07fccc5a1c089"; - sha256 = "1yrncyvfqa16vypdh7ay0nb7wzgidd3cxx81bc01jw4h3f1gfrx0"; + rev = "7334155c68acd932e275fbf203f05eebf7f741ed"; + sha256 = "15ddriks3ffyz8q0g8nkb35dmm2apclw04dkivjbbm21dg5nym11"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1448,12 +1460,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-07-03"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "b6c406e2b941abbb334388d6d3e82a737e47ae11"; - sha256 = "0lw2q6hjc6yd8p6afkswp40lgg4i5agjyj161mp05lvdp06jb05x"; + rev = "ecd211e46a1d4fb0efffbdb2c2bbd59785605870"; + sha256 = "0pf9bx2xrv8kkg4339w7cqns4v8gkg4jppsccbymhbp4gj9xhw7s"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1472,12 +1484,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-06-22"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "cced9374c8b15eb466d67ce1c56e854abd1f0d46"; - sha256 = "1gfxnc22warpbxw6qykrc3850k3ij1zyrhx85ln57kzhsngamy5x"; + rev = "7ad0e43e0098ae8aecdce81e920688afca95631c"; + sha256 = "0x54vbip7saswfqypcfh4hw8yrn59msz196hi92gc8ldg77ana0k"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1592,12 +1604,12 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-06-02"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "2b787129314c5fb8bfd41a6919d4889210e6b265"; - sha256 = "sha256-ul2X6kIdreJ9dCQERw7C3l2dss7Mtcwtm7CGhAxjjvY="; + rev = "61d86ffc5863833aa30c6098f95a1e56670a6c64"; + sha256 = "1f629agggkxsdfp7gmw8j60q7szd9lvrazyy8d35avyn0npmp64n"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; @@ -1615,12 +1627,12 @@ final: prev: 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/"; }; @@ -1735,12 +1747,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-06-22"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "e6e3ec979b586a75c53e72f2d6a035f28bb3979c"; - sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; + rev = "c5ffc6afb7f3a68da981ed9c56f3d9d8f3d907b7"; + sha256 = "1shxx5h0y7rjh6bam1cckrrrqjhb2mwr85pja39p9s4zpvj0r0am"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1807,12 +1819,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-05-28"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e"; - sha256 = "0n66skklf71sbnk2vbsx23nqhs5a920w6aphfa5f3i1vrch2rz5f"; + rev = "3d83031c4b63f9b10703e32e070cda0700a81992"; + sha256 = "1vnd05v6ni7kn3qkrmm75ns2p29liyl1b1xl56whijp0r0v26s89"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1939,12 +1951,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/"; }; @@ -2167,12 +2179,12 @@ final: prev: cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-04-01"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "5ee85e0722ccdd8253b6119e7cdd9055010093d0"; - sha256 = "0vxkdys6af38shv75laya871jb3jinhrfsdjm5wdxbxyl4lp39bx"; + rev = "f9bcbf6d73c065b95cdf891195e825d918412a3f"; + sha256 = "0v6rss8sgzig08x23x329alpyixx510m5mf3b4v8g6nsv06ldxn0"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2263,12 +2275,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-05-29"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "f0ce9ae23d6ce9d0cbabe73bdb738e45accc6f08"; - sha256 = "1ddf0y0ixb9aqjwax7jsnji6yhnvs13caml47c39bgcq80s37zk5"; + rev = "ae1a5576936f78ae46a51964db1b2293b40ff27f"; + sha256 = "09m4zrs33msjc0ifqh5xk4pzlm8ws5xd3043k1xfvaw6m3ic18d2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2287,36 +2299,36 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-05-03"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825"; - sha256 = "0zssbn655hqxihmswbhih5w9k75gkhyqn9bm8n9vdqihygh5g9js"; + rev = "f6a2ef32a9e923cb0104a19d3e426b0e40e49505"; + sha256 = "0cijady83i5wixjfsgv979h9iggw76d5fwr6vrrnijwdkx7im6zi"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-06-19"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "7a01ffb1e6538fe634f294908a50a7b680039284"; - sha256 = "196a66my0jy4166irhwg908dayqc2pv0yiwqgsisi8srzybacm6f"; + rev = "e0342fde9474fdd0a36ff9692fe0031b7611a19f"; + sha256 = "1s2k680k274pkn6ikw5z924847s72f8r6lhfxf32q55mc5id709y"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; codesnap-nvim = buildVimPlugin { pname = "codesnap.nvim"; - version = "2024-05-08"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; - rev = "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b"; - sha256 = "1j1qw9wr2ymwj75k3yhby2fcq81b68yxp4wvd16xnq3ivyg74r3l"; + rev = "c2924bf6c9a2c2c03318fae9b7fe0706412b9d9c"; + sha256 = "0xvixdcplkmysxfrlfz3sjkhzh4bswgk86jvrpvhq1c4kvyg53lp"; }; meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; }; @@ -2383,12 +2395,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2024-03-28"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "e4618dc08695fbf3a1171f12e0fc803ac4a3a19b"; - sha256 = "0x1wh6v11nnmi1xfy6qk5bb3riindigxnmyi407pfpb14acvl51l"; + rev = "e2a0513c91a7ebdde23cab0b6724ba05292551ff"; + sha256 = "13i1ap2g5sg5ldky4y14m7lq8y9nb697gyvicl5n8hga535ah9wm"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2491,12 +2503,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-25"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "4ad0395994f374e6c797266ea4acca90927f19aa"; - sha256 = "1fj2n5p335as4cdrn0msi8a4dmzwdcplwlka8hra2p1avrnv8lw7"; + rev = "892c1aac059b7df16dc636eea9e34be53f53ff96"; + sha256 = "07dzl4zyhxf2y2pv4wijs597807jznnrd15gzl48snsnkdrx252s"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2575,12 +2587,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-07-01"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "cd75be867f2331b22905f47d28c0c270a69466aa"; - sha256 = "0lck0dzrisb3p4gw1qfyh4874nfj74ariw274s6nzqz39bk8nmqq"; + rev = "25d48271e3d4404ba017cb92a37d3a681c1ad149"; + sha256 = "0dbw1b25g83iy6yvc725k7il0l7yli4qd9s4wylcbqgacss2nz3h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2588,24 +2600,24 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-06-21"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "a81977726f726b21d4bd75cea5bbbb7022005507"; - sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33"; + rev = "1157614e1c757cdbe062b08d617d162fb34ed3a3"; + sha256 = "03rrfba6z47sy4x1a7wrmnlfysz20zn8z1wxinbf60dkaiyjsfgp"; }; 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/"; }; @@ -2648,12 +2660,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-21"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "0668308e68b0ac28b332b204b469fbe04601536a"; - sha256 = "0vhcdzhrkh3rs88kh481310z9ma775za1gf7nf8fq1x0znd2455w"; + rev = "25f73977033c597d530c7ab0e211d99b60927d2d"; + sha256 = "1s1jf98kvv7rfiyxyhj3ba091rissc7n953dshpikbj2n85inlma"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2672,12 +2684,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-04-18"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397"; - sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1"; + rev = "6a53363555bd483818ef2a3103db8ddc8d98a41d"; + sha256 = "0c5l8zwrcyab36l3diwb6zpncisl0nn0d993vwrzf2430nak59cy"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2696,12 +2708,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-26"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8"; - sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv"; + rev = "bdcc65c4636a8894ad4c66aec3192d9da4ee760f"; + sha256 = "0arq12fcr3yfnl8smk2klv3wf81bq4l8ban5rr0acsh03skpwajl"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2744,12 +2756,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-07-01"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "c3fd47391de6999f4c939af89494d08443f71916"; - sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb"; + rev = "1c924d5a9ea3496c4e1a02d0d51388ba809f8468"; + sha256 = "1aig0p82q7sy3291671msh6yk945dnxczw6qg59n5w98aw8848cp"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2840,12 +2852,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-07-03"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "998e6562cea3f86af74c489eeaf005ae82657886"; - sha256 = "0azwqlw14ipailh6xdlvflzlc6d2r7gn0syba5rs3cd42pdgk01f"; + rev = "59feb56373c368c3d865fb8fc744e7484250a30f"; + sha256 = "14svzd0kpfycfbnksiizjsl6v150cl4v83010jlfckylcg75h63f"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2876,24 +2888,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-07-01"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "e6e33b848f0e2fe5c13f6553c568764555c390a3"; - sha256 = "14nhv9jx0f92gp49bymr5wfnsvwkfllsmb8ax9nbvj68i22baq14"; + rev = "fabf5feec96185817c732d47d363f34034212685"; + sha256 = "0lf1sxj6fjb6m5z0pf32yg5z70rvkx7s2nljm1r00zkfgqwys9s4"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-06-14"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "bc691e879a3c1c7b92f62e830d58ec3f40331fbd"; - sha256 = "0paylwmbs15vnj25nxcqn4dw7nzw3xqp7xdq2mr4p6xdhyw4akvx"; + rev = "07b3b4fd4b807c77b65f57d3d6a484a74a76bb00"; + sha256 = "0j8yv53595m05725qlal4h3j28ld6g870ra0bkrrbar4a6nq2w30"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2996,24 +3008,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-28"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "09e64956c2946bba0a060d0a0aaddde106753bd9"; - sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc"; + rev = "fcc579be1f11d24b56d4d0180bd6ca8a8b919cdb"; + sha256 = "0ps0ki7k3354dj6zspjmf8390jymp9949nr66fzp7cwvmyqvn5f3"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-07-03"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "dc1efcf37e8c415ca686a4b6faaeae801ffc7ab4"; - sha256 = "1pvqxbyiccq5y9m0v23prkfi5b5p09xbn6ygckv7ppi7gb63hr2k"; + rev = "0289c480eda61e53665e1765d7a0580e937a8ace"; + sha256 = "0ph1v14y6fnp3mskqhr3c58hfhbp0xwdhdnq1aifavq6bkqv791b"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3286,12 +3298,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-06-24"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "750f802879c90ea51f92b68c35fa562ee575804a"; - sha256 = "0zcg3lyxjib9323dwilplgycxx0gcakfncficf3niw76j7zqgw9c"; + rev = "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490"; + sha256 = "15qh38igdi46id6y94w2ymx91n4gmfl1xv6i4am27g65l95fcfmm"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3370,12 +3382,12 @@ 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/"; }; @@ -3394,12 +3406,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-06-15"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "79847a78ec0c58f5e5c0360192b03d0cee803e95"; - sha256 = "0k92lqkqfah0xgl3yq85f1fr8pryp6cfcgglwdbsqw1jwsh37687"; + rev = "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36"; + sha256 = "0awd7qjnx6gnvisjagsm25fg5wl5kfzcxiqf2jvfs8i550rd54rk"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3418,12 +3430,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "95d2ccf1a962445eec8640a507b97ed10d7d865b"; - sha256 = "1islv5bd1x3s7l6x0gigi3xj9k28dz18riaakjhm0sl4p70hxc3v"; + rev = "2de1aede94569f643de438391f6c8b1712038d35"; + sha256 = "0mm428spxbpknzf9s6r3sjh3xj13b4j0ymxg7sm9c9f9jqa3zdv9"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3442,12 +3454,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-06-16"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "a8bc1d24798c80a391f1a5d898a50c41a7f93883"; - sha256 = "066963g4jykzw5fg3mhv301ksc67vmjgzw0fm9izip9qrpb9i91h"; + rev = "ebb77fde6f5cb2745431c6c0fe57024f66471728"; + sha256 = "1psavlldajgfvwx0jjhwdilccrhz38p880jsrddmrmfx9yq3yl5s"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3479,24 +3491,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-05-21"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "eb2be5b24dbf7200a80bcd5c64bc63afbc8ae86f"; - sha256 = "1k7spx8iagmklrbb3l6dmj217j8110nja03dhpz52znzsir5vlpj"; + rev = "fe560e3c6c878a682f437d8adff34f5f8a53876d"; + sha256 = "1zmsw26jn1q9a5bbpzhg3di483qsy2dj2gvwcmwgaks5dp6p3p60"; }; 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/"; }; @@ -3576,36 +3588,36 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "752a026157f5befaf705bccbcb2ddb5b67703e03"; - sha256 = "0715aaryz76dl9sqsfd8kyz7nwk0g803h6pxnnhlxzpigq9fcs8m"; + rev = "b49ba81e79b20d2b47bb71e98fa984bae90731be"; + sha256 = "11wvr3vrz45y2d1v7h2jm7bhbbkjjx4jzjc2qgsgcvs3m68fiyrr"; }; 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-05"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "c540d58bf52aa979d4cca639c60387ae0c0ccf88"; - sha256 = "1hd9ph3f56y01gd9ipbd5lw4ips6n9wcr4c9snc60c49z6xammlk"; + rev = "2ee9e64d4c8133da1131edf0e64641e32dd16396"; + sha256 = "057hkbd5ab1xm2x47b0wvd4qafwinlwhwixqbl6dgdnhbi8my6d0"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3672,12 +3684,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/"; }; @@ -3708,12 +3720,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/"; }; @@ -3744,12 +3756,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-30"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "c6e37476ab3b58cf01ababfe80ec9335798e70e5"; - sha256 = "0mcfm4ya7kwr6yj0wfwylqqhiv9hx7m45dpfsra7zzjs2xjpcplq"; + rev = "bb70728c13c305ff35193586d5f6ce68668af063"; + sha256 = "0vfghlqaj9hy5q4hcjvyksqb45dfyvwmlz3ns63jmwn25hbzs9h3"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3769,12 +3781,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/"; }; @@ -3913,12 +3925,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-06-17"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "682157939e57bd6a2c86277dfd4d6fbfce63dbac"; - sha256 = "16fivgnm9vzsk0gqjg8xjp15lrfdlq0w9wa00344yifqvbfam9qi"; + rev = "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4"; + sha256 = "1jkm5hxgpa0l6qmr0mspykcndl4nh50lk13q4b7rv3byfryv40ck"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3937,12 +3949,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/"; }; @@ -4021,24 +4033,24 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-07-02"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "3b91c1a471160bd8620bdca8f18743d954994daa"; - sha256 = "1qapr7nhp8kz9dzkzkkqzlsv51qdkdv5zr457pgnf7rpk3bnf4yj"; + rev = "73bdec9ac5da578376bdc5a705ea80a19baa4942"; + sha256 = "1b4izbp8vc2mfa8qahlkna15j66dmsmv7r7g8y3q656hgnc2lwig"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-06-06"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "279e1ec068f526e985ee7e3f62a71f083bbe0196"; - sha256 = "11gxry27alq4fzynmzw0h2q3vjx5jc2krj1pq9q9xs7yc5fj46y5"; + rev = "6f28c8c7bb551161a0315a76488522204f39c1f4"; + sha256 = "1dbinqfsdi7sqbdb39cis74xk44vc51j3gzqwjcms9dkwbh8sbcy"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4117,12 +4129,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-05-28"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "408d5487d908dfe5d48e5645d8b27ddcc16b11e0"; - sha256 = "0m7rg9yn08c9c57dpyxqlswk19mgl8r8krwqhjj3l3n93mbxqym0"; + rev = "50543e3993f4b996eea01ff5ccc8fe2a354c5388"; + sha256 = "1bn45k9w3g93srmr7dwymq90av5zx1zr21kki7fq3xpc5c9vmrwf"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4213,12 +4225,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-28"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7"; - sha256 = "1xaxi3v67wdrgyclcrimcpfd1ggfb0wxxy2iz9xmqlkvc3g3aws1"; + rev = "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2"; + sha256 = "0yx3vs0fc0qlgy9f2dndbaxpaw0izja5nxnv3zdwkn7nwknxnmfa"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4249,12 +4261,12 @@ final: prev: 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/"; }; @@ -4273,24 +4285,24 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-29"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "cde0c7a110c0f65b9e4e6baf342654268efff371"; - sha256 = "0xmyy4wahgi097ay7bs091q9d7ysvknargnlcg8l7qsq6wipl4d9"; + rev = "e66c3240d26936428cd0f320dc5ffa1eb01538b8"; + sha256 = "1vgzi24a518dn1x2lp4fysfdy62nj0rykl3s5iww75ckfssvxlic"; }; 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/"; }; @@ -4391,6 +4403,18 @@ final: prev: meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; }; + grug-far-nvim = buildVimPlugin { + pname = "grug-far.nvim"; + version = "2024-08-04"; + src = fetchFromGitHub { + owner = "MagicDuck"; + repo = "grug-far.nvim"; + rev = "3e491ca05c50f87d02543adb010aed9dfb1e12c1"; + sha256 = "0vl0c5dl2fg90mly0qpranf9a22iisgswx856rjzlz0jan6pxsvr"; + }; + meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; + }; + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; @@ -4429,36 +4453,36 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "23371661bac2b7fdd9769c685e4224990c3b9ab8"; - sha256 = "0f0kpwzl614zwbrc6rc8x5cl54dhdlngg41xr19wzcklnqzbl0w1"; + rev = "91f8170a31ae6e31670629cd339df297dbd5fd5f"; + sha256 = "0xpi8h8p19dlfpq3a5xfhwpcv6z5a7cdpc2ml1yxc7d0hk1k6b7x"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-06-16"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "0ab9d8c7a8b4cd26338ca0c816c4ca1a48f9d5d6"; - sha256 = "0il0rkj3yskfy591phdvyd8kdc14303m1g58hygvdd46ccsxj8kw"; + rev = "e9f1616bc00a994e7e135297876df1143bf1efc6"; + sha256 = "1qbdbfpzrd2pc2d1j0yklhl7d9907wx2w54vwvd2cqwa91hm7dhm"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-07-02"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "fa8138d25c061b9cbfacdd3f4dd1929e2a6d92ce"; - sha256 = "007i6gkbapyn2fv19yr5izfsv859qw4qnbdxfp7kv0sidkqdk47p"; + rev = "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e"; + sha256 = "0hr9yf7cn6asq39szfr6nwvq40vcyz7hv9bph51z14gjkdv67pzs"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4477,24 +4501,24 @@ final: prev: guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-06-05"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "b066152fe06122b047a6b3ce427a19d8b6e628ce"; - sha256 = "0qcq5acnq6hgxpi9f3qsixsgvlzlaq1nmizwbanzkqgcj6ac4bzj"; + rev = "14a8e35993c4513da1c93719234de09e7d3a91a2"; + sha256 = "1ycvq5yp08ald5g16vdbyfqlx9kscl5syl2hwp6czn6644cdgasq"; }; 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/"; }; @@ -4525,24 +4549,24 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-21"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9688bc77bf9e8e2ad97cf0f9b7701407aa2b31c2"; - sha256 = "1paddg7v3akc4s2l1br4gfwvbg1gxzgajaqman3fi56pl7lw5xy1"; + rev = "86363dea69e00cbc48f02579cb6108b283876548"; + sha256 = "0gdhm1acq83r6b0jylxlwa7ifvxa98ywl27z7bhad0gb11rnmpma"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-06-10"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39"; - sha256 = "01b34bmyw236xr8bcwwn40s6360ybmrd9lpbw0hnvkn4nsml6hi6"; + rev = "91c6be1a54fa057002e21ae209a49436bd215355"; + sha256 = "0i3ih3i162v6lkm9l3406j5322vyjilvhl1qvpc9d67ajs355cm4"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4594,18 +4618,6 @@ final: prev: meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; - haskell-tools-nvim = buildNeovimPlugin { - pname = "haskell-tools.nvim"; - version = "2024-07-01"; - src = fetchFromGitHub { - owner = "MrcJkb"; - repo = "haskell-tools.nvim"; - rev = "239875d842ca25d4eb7dccac574ab9a5f5271c34"; - sha256 = "1w5m248lg7c3hnm4mdrchkhxr5ack76x3dp3p4m1vgix9gl8hbl9"; - }; - meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; - }; - haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; @@ -4775,12 +4787,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-05-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "7f53e1d4fdc907e808999c83ad3592e336398add"; - sha256 = "0kn3jmzicpp2r6q3p1bdv2yw32b8rpilzafs25hpryanyngbswmk"; + rev = "5462d3eb5c191ab380ca911e1e931836d27f6a79"; + sha256 = "1dxdy80447ncjrj74rvrpxwx44ygbsxblv27q3lzrk6ycbjl51hs"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4883,12 +4895,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-27"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "7d021c94e231d491355f5e724ba357ace296f06d"; - sha256 = "1fjh1w07lwngyxa7aqxbxw6x0npz6x1zb7k73q8zihrkz0xrhcln"; + rev = "6fb2b84a739d92b781bba5f59f2678ea047332a9"; + sha256 = "1x5c2fmp3n7xvxq76r1na8zmbz0y92bsi0vnkvixa1wgirra5nym"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4919,12 +4931,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/"; }; @@ -5087,12 +5099,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/"; }; @@ -5123,12 +5135,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/"; @@ -5353,48 +5365,48 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-07-02"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "d0921f5b9b3d2c5e09618da55a018228edcc4d16"; - sha256 = "1yl852zim52mrj4ddc30pfgyrp58wjkfcvmiyncqgj1nsibhdnxz"; + rev = "077102c5bfc578693f12377846d427f49bc50076"; + sha256 = "0yj0z62cr5ddzdl4ba2ppj1j102qfx1qfbwbh1z84p8x0zn6ppj5"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-26"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8"; - sha256 = "04qdq0wz0qz0p2khm6jdzxy70pdya9dfjc9ij4liphxjc3pf0c9y"; + rev = "491452cf1ca6f029e90ad0d0368848fac717c6d2"; + sha256 = "1yc87wv6g19yj1gypfy4nl9irpb7zfqlw98vyaf8aqjgnpd0z60g"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-05-13"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "ad3e1ea592f9d13e86e0d4e850224d9d78069508"; - sha256 = "19prmdslqjbk40wd60is27zwsspsvxi5lsk5wp9yry5s7wzjrw7x"; + rev = "dc56df433bfbf107fee0139e187eb9750878fa84"; + sha256 = "0wvbr14yv4bgb91zns60rcb6r4fl97jdhqsx8flwq3naqj5qayq6"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-07-01"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a46a28499bae49f5f0e99d04134ba4617a213304"; - sha256 = "00621vmbyvrgqpwlshmndnmflggb9jhislqqlmps8amqryq57y5w"; + rev = "539a4f5944edb58ed3fbf72416396fd4014fbd3c"; + sha256 = "1qqhg570sbwcfbxaax89r608rgqdvi4jpi96mjlhrwxqmhlgxxvf"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5425,24 +5437,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-20"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "eca8108dcd5f41fbde2a674dceb58b81ed887dc8"; - sha256 = "02sgp1lv4s7szqw2awsaavlhvji8jn24g8hzj7d56y6hjl6pz1id"; + rev = "c6bfb191f1161fbabace1f36f578a20ac6c7642c"; + sha256 = "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-29"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "847af406e688e172934ec91ba12088ffcd497e1f"; - sha256 = "1grp39x69i6yqmcflnwxj74knsv5pdxfa096sxn7h458nbdm3pma"; + rev = "c89be94fe96dc5eaba67ad9371263bc1eac75044"; + sha256 = "1mq197p33ywp9cz2h38zx37nmgnqa0azz7c0c2s7n6mjxr6ych8h"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5725,12 +5737,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-04-03"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "3612642b0e2eb85015838df5dcfbacb61f15db98"; - sha256 = "1pizkn16ma7yfsy19g06f6l6zkqwsjkmzybqhhhp18xbbyj7m8cc"; + rev = "0d1b6e3317ff64719e8e6a4f534eebeddae70582"; + sha256 = "01g3xqn981k20a9qa2jz89vkj55hagzd75avq5zs8c0jzdlm1g2f"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5785,12 +5797,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-06-29"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "87701af045b3032515776abeb47eb8c2ddb5e679"; - sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh"; + rev = "56db3d5ce5476b183783160e6045f7337ba12b83"; + sha256 = "0drk31bkws1bhjl0l2z7vmcqjn3y1bvhic78dr63j5j9wiyaxzvq"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5832,36 +5844,36 @@ final: prev: 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"; + 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-08-04"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2"; - sha256 = "1zgc53kdc10k7pa67svjw9bndazblmjw1lrsmdprggsxvcd1x2n8"; + rev = "a751b92b5d765a99fe3a42b9e51c046f81385e15"; + sha256 = "0k112zrw3zjxx9m8pcpmv644vl25sv0mpa4hjx75q76i53yyhz54"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5892,24 +5904,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-04-05"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0a5a66803c7407767b799067986b4dc3036e1983"; - sha256 = "1llhfs5wgv87k5hv8mdyv4qjpw37zq27488lq0j063jicxszdhar"; + rev = "544dd1583f9bb27b393f598475c89809c4d5e86b"; + sha256 = "0a7m6g7gzsxzgs4vhsfsznvdx06n6zqjmi9h1z1zbvdcfp5d3l5q"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-28"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "ce0a05ab4e2839e1c48d072c5236cce846a387bc"; - sha256 = "17q4b9hlnj7cnijw8xcn0g3fk8q3c8smz6l125hlwzlak23b716d"; + rev = "7552e6504ee95a9c8cfc6db53e389122ded46cd4"; + sha256 = "12gf4q7nmw0psj8m2hx55a0nlxafzvlabf9g4644ay1p74hj07ij"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5917,24 +5929,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-07-26"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; - sha256 = "0cacfxrvm1fx73q5mch72gglrg6hvi39w78wgfb7dfkby1j8hl8r"; + rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9"; + sha256 = "0skbhprgxc8mpny0gc6c97gz9ng65y6kcqv4qr1lnil9lpgnpsw2"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5951,18 +5963,6 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; - lz-n = buildNeovimPlugin { - pname = "lz.n"; - version = "2024-07-03"; - src = fetchFromGitHub { - owner = "nvim-neorocks"; - repo = "lz.n"; - rev = "4c790ba2c3789f580aa019712bbe3112f85e73a0"; - sha256 = "0vwpfagpm7vik1cg4cwx0r00fqvbq2id8b78wzrr090xp2a2cz50"; - }; - meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; - }; - magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; @@ -6035,14 +6035,27 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + markview-nvim = buildVimPlugin { + pname = "markview.nvim"; + version = "2024-07-31"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "markview.nvim"; + rev = "d0ccc97b5c988fb28e5033abdf7b832b9dfaf897"; + sha256 = "0mln2ll82gkw0icswgf6ya5g6ndr4d1cn0lfx06gz00xp0h1fh2p"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; + }; + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-06-12"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "37a336b653f8594df75c827ed589f1c91d91ff6c"; - sha256 = "1xiv4km5m3y8znqq2a5f31fqw5aygcdr11lwpg0xrvf359z41g7i"; + rev = "62360f061d45177dda8afc1b0fd1327328540301"; + sha256 = "0q722qxwcsvs6bp5f3hvagsdz71l2ffd5g9yhsjjqy452lqynjai"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6061,12 +6074,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/"; }; @@ -6097,12 +6110,12 @@ final: prev: 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/"; }; @@ -6143,6 +6156,18 @@ final: prev: 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"; @@ -6181,12 +6206,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-07-02"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2"; - sha256 = "0mwgyr0x21pp788k7020bb5hyj755vs7m72c7m0bh09c4f3z7aj9"; + rev = "af673d8523c5c2c5ff0a53b1e42a296ca358dcc7"; + sha256 = "0rky24war90avndgm9fji0f20d24bgyc3s1spgw5lw443wh9vizl"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6217,12 +6242,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-20"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "8065d69e73a2623203138bca9dc436df7784ef11"; - sha256 = "0gxzl1ly9cw9lqpxrrk4k28blrq4a7vcl7jl279zm981yvpbnba5"; + rev = "faf013f7ee254f52b88f57b088f650150409cb24"; + sha256 = "0s5yxgr2xsr7n25fh588g6hr83ps5b53blg88156lxg5rjkj460i"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6253,12 +6278,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-06-08"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "181dc38ddbcf9ad94d454cb06b13c859d4ff28d1"; - sha256 = "0q6r73irr5fk4z4garfx7h15bfxlacn2qynk0gg4jjrh6my0vdy8"; + rev = "f978043c34f4e967a5496b4fa78c2ad092315b00"; + sha256 = "137pzp3i2yldarz6ynygfkm3yif1r76ahs5l9cy5bml817rhyshi"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6277,12 +6302,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-07-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "1a5360c59dc68230aac867fe262e4efc53f1b2d9"; - sha256 = "1ns9lq4bj8s2amwkj4kil3h3lkhgsf7wvyf3w9m6419svlxvzh7h"; + rev = "eb6d0fe33e14989b0f1fbe25d9732889ee57bd1a"; + sha256 = "0prm7i4fl5lbfgdk9s9n9sn05a0hrbfdjgb5g393hjjkid8f4haf"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6613,12 +6638,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-07-01"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776"; - sha256 = "0x6i732x7jxjry09fk2shn39winxgl58pjwd06v6incy1p33a9dk"; + rev = "17a3367bc4751859cd50e05f38fea0b7a4b7ed42"; + sha256 = "1vrqiz4cy2fzx61js80dz1ns2lxfm927wmybi613azrxkhz7jy66"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6649,48 +6674,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-02"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "6de0add4805165317ab7d3d36b5cef48b1b865f3"; - sha256 = "080pwb0bwnd12ypwaa5hsy7sf8ha791gic5wnq8nm8pzyxz2nbiv"; + rev = "4b22542b96712a5a901fa909b7dc749251ae1625"; + sha256 = "1258d2qqnf0qc07fj18601wfanwccpb8jmvz8nv3vw5fn6pj0l76"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-07-03"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "e1bcfc87f3566fc43b875cc714ea348c8f88931a"; - sha256 = "1rvai4z77rv6i1p1iyy49mwl7l067a295izf3wflfkq15mhq2k8b"; + rev = "2b74a777b963dfdeeabfabf84d5ba611666adab4"; + sha256 = "1kbzw9z83rh210r7kgx9r6q0phji539zvrdj963g4gf438nrplib"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6757,36 +6782,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-07-01"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "99b32492b836b64a5ff4544d4c466496f0aec9bd"; - sha256 = "0hjbllib07aqzb531fb9lflid3p09ny9bii8ds4fnpvkbic2wl48"; + rev = "e5e797e6eddcb6efb1d2c3fc2612b31ad9a76cef"; + sha256 = "0439h307zphrz67s3mvcjwk2ixn1vrxas62lrcp2v07w8gln59m1"; }; 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-08-01"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "a731f66f1d39ec6175fd201c5bf849e54abda99c"; - sha256 = "1f9f5gqn1kbrhwfblqcsjacm7y17qai931xmrlny7hqlv1c6a26i"; + rev = "532dcc8cea4287c4cad6bb77532989a8217cfc7b"; + sha256 = "1kcy17jccbhc4ha81fcxcch60hdlwzywd88ghx8r0j18m2wngb95"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6829,12 +6854,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-19"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "26ed90509c377d10dbdebd25b7094a886323b32b"; - sha256 = "1b0pw875qnisxxraxwwsb4r6b6234a3na1vhs6r1hz6h5xrxzqmf"; + rev = "32ff2ac21135a372a42b38ae131e531e64833bd3"; + sha256 = "144wzzadhrg48fkihffk6jf9c0ij8dg9gng6mcxq5z8mdcvz0124"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6878,12 +6903,12 @@ 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/"; }; @@ -6925,6 +6950,18 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; + neotest-golang = buildVimPlugin { + pname = "neotest-golang"; + version = "2024-08-01"; + src = fetchFromGitHub { + owner = "fredrikaverpil"; + repo = "neotest-golang"; + rev = "f71d2494726c529c5d5c43813b24b3dd91ade981"; + sha256 = "04k5g7m1vab11362grl1c755zkdw16xz92dpl4a39h5py6wgfzp3"; + }; + meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; + }; + neotest-gradle = buildVimPlugin { pname = "neotest-gradle"; version = "2023-12-05"; @@ -6952,24 +6989,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-07-01"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "f5614c9cf7a056f791565183f216401b28438818"; - sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i"; + rev = "dc8884ba9ed12433f4d2f13a6cc127a6339b4825"; + sha256 = "1mkw66jwlqiyzf971ygxks0r9zlddqfjfw5v5vyr1qvbfs049mm2"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-07-02"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "ce8b10e4e4f670b6f79224139053679864fa810b"; - sha256 = "1hbfdv8aw4bv8a69jscr7kynd0ik0506546qsvd39mh7mr257mc1"; + rev = "b48bd1621b532106ab8d1ba18e8a7bda4463ccc6"; + sha256 = "1biqiv7l8p8ml0fslwpwrb7h2lfjh1h5dj3dw9ns27kzmd7f92i1"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7024,12 +7061,12 @@ 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/"; }; @@ -7120,24 +7157,24 @@ final: prev: neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-06-17"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "7cc48ba642a6acb96f377054cc4439c6a135fb5d"; - sha256 = "0dlc2zd5qwak5gwv1pv1arbpj56scnaz4n1my50i97rvj4yf3vmh"; + rev = "b3e6246c07d3d4f06075f33aea896affd25f0de9"; + sha256 = "0v75jp4rr35fnm4ksdgskpdvjay86y28c5ibbfjckn4zajf7w8nz"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-30"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "d64a8b7e8730095ff634e6586584e8543043e986"; - sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4"; + rev = "6993189dd0ee38299879a1a0064718a8392e8713"; + sha256 = "1fj0k6fkyk73jdjps8660nsvplwj2wasf302rbwbpbzmdvw46q6v"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7192,12 +7229,12 @@ final: prev: 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/"; }; @@ -7252,12 +7289,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-06-22"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "9f8fb93c70e9d759d849b45859f017b348618299"; - sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn"; + rev = "608d39bb102e6bdda76ee450b042f74668184ad7"; + sha256 = "07k0z08gq7pyadqxh2lwk3zgvxwnr7m4mgag9z2ys25449c18qkp"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7288,12 +7325,12 @@ final: prev: nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-04-28"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb"; - sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp"; + rev = "d3e8b1acc095baf57af81bb5e89fe7c4359eb619"; + sha256 = "0z81af970w1rllh2abdvlyx63z4xkcf5jw3wy4xv99gvqa1fxryr"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7336,12 +7373,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-30"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "6994cf0476f1d834fb9d0b5f454b7efe650e1d24"; - sha256 = "1j16ih24yypqcsd1grd5ymczzkqd26lppdl2989mc3wwycvbvdz2"; + rev = "4ba23d18fb321f45700025945f159d2fe06506b4"; + sha256 = "16n286r7l9j5kwz8cp50xvxch72w2jfi09sw91gy4djdf1qh7v0p"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7360,12 +7397,12 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-05-30"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "caf86fbc3cf390cac8c5fba599f1500f49f622d7"; - sha256 = "0kgcrsinb1lsla9y6yf4svnbay2s75zc5yhil2j149n64ff08gqa"; + rev = "b63937a5ebba1ece32f56256c46d166e62aca7fc"; + sha256 = "07h118j4y34bb8hpljrd9n6v2iz0n0vp8ijy2vfpkm4jnm1bh02b"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; @@ -7396,24 +7433,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-27"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "03c6a75661e68012e30b0ed81f050358b1e2233c"; - sha256 = "0164qmf3kw0nml1sy32yl0lzkbi4g9j3vvpb1lwh8hjz7nvhpp8k"; + rev = "448bb9c524a7601035449210838e374a30153172"; + sha256 = "1pxnfgcqh6b14z699akvzbq2vcvk4glfjpk5d5hybfn6fnbidapk"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-28"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91"; - sha256 = "0975xwpagsjbl1ahkdma12fppjg7k5ami0mzjynzig000f024pq9"; + rev = "cfa65d86e21eeb60544d5e823f6db43941322a53"; + sha256 = "1hdlrgvllsqhmdd2wnmr529pz1vq1cd6jayp7zfxk8hik154q3v4"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7504,12 +7541,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-29"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "7b73d1111cfb41f980d25c800d86d43ad802d8b8"; - sha256 = "05llkd2l1jwcjw7cd573b2dr03zb6dgwjf6xf0a5qrj6vh9chgay"; + rev = "c40c5116c4c091f4da620abcd9c58bd5ee4b8497"; + sha256 = "1wry827rk2j5kj8a2mch9dqcb4ky0ggh5x3n76yg96p8mxgglypi"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7552,12 +7589,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-05-19"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "c15de7e7981f1111642e7e53799e1211d4606cb9"; - sha256 = "0nd175qdh4fr0qjvdj7fa89lxhzdrf6ilc5r5vajzbfmbj72lh30"; + rev = "e38c5d837e755ce186ae51d2c48e1b387c4425c6"; + sha256 = "16wm535ihr8gxngx6a5xj4phz6qjshxi4nrcx2ks4bmd815gdsnv"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7624,12 +7661,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/"; }; @@ -7648,24 +7685,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-07-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "85855b38011114929f4058efc97af1059ab3e41d"; - sha256 = "1z88vp8a56blhm7s0p1s19i2pwa7dldaxxh86x7jj0dyc8vwbax0"; + rev = "194ec600488f7c7229668d0e80bd197f3a2b84ff"; + sha256 = "19142fnhvmdaasmxjgh9bksg6c5kq71w816zjzkfwdrpydqwh3j3"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -7744,24 +7781,24 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-06-03"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6f79b822997f2e8a789c6034e147d42bc6706770"; - sha256 = "009aal7bljwrryb74c02jgmfzvhg7v2hcr5xy19r000whnjgh89i"; + rev = "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a"; + sha256 = "12bxs0dh6h1rkb45xb0cb7fccgm1an96yy28rcf2jddsfhgfzw32"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-05-27"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1"; - sha256 = "1msz8fiwsvjdda870k2y85plb4wg7xs3fh5w7hg8iwgmx6ykxh07"; + rev = "5030d53097fed7b75524a04048d8dbf417fa0140"; + sha256 = "1s1g9s2gyfy3s4xnrzd980qpjigzdf4l9dp11kzlk7h26h5mhmqr"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7780,12 +7817,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-05-28"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b7267003ba4dd860350be86f75b9d9ea287cedca"; - sha256 = "0sz6p8n58gw1mbvk6y6pjfz1pdp979msxy2za0b492wwxwqbhqln"; + rev = "a5606bc5958db86f8d92803bea7400ee26a8d7e4"; + sha256 = "1wwh70bj2798nyv5md1s2a1h3ayni8lajwzm6jby4ddx51x9fvi9"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7804,12 +7841,12 @@ final: prev: 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/"; }; @@ -7876,12 +7913,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-20"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "07ea6edb98b63cb625ab4230d0479b5ccb20ebb9"; - sha256 = "049hibr0q6if429908v49gxijwpxghjph0981n70dzn2vk0ddkz0"; + rev = "8df00d9ec00e31a2280a3cfb795a30f85d1a5c2e"; + sha256 = "0synn533v1zy87gk8762p8j9hdica9jyg9rgmwamx5yd5zg8xgcb"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7900,24 +7937,24 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-30"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "a8f6952cb1ff7bde864a34c502f1a42c360a6662"; - sha256 = "1ib95qqgk0vvn9yfag8sh0dxrl4nmxy8q87ikn50ivm7nmf2bl54"; + 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-07-23"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c6982939cdd0046a89d0849383476b69569d5462"; - sha256 = "1km15lghjs7v9b5dx9dnzqml4ay7w6s6dmidzk957i7n2j8wn1vw"; + rev = "31f52d52a618aa16d2576da85992ee9b2d10babb"; + sha256 = "10hm4xv9kds9sxz9302mg6ik4dhsxfzvhwm0w2qqq0y8smrnjgy7"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7948,12 +7985,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-06-06"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d"; - sha256 = "1abrx6a3d2yd6dlykhbjwfvqw18w126qkr4y4va9xv26k78p17gw"; + rev = "be5c8d49e0f5c01978aed2314ec47fa8eae759ca"; + sha256 = "11lb2ayr0l5mdhg69vmx3ks7yixljyhw81fd3dij9z2drw344z5h"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -8067,12 +8104,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-07-03"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cf97d2485fc3f6d4df1b79a3ea183e24c272215e"; - sha256 = "1vs6cwa07a18p1c8q4z8gfqp7iki4qwdk10ahyv4sfgk0s1wdk9j"; + rev = "e6528f4613c8db2e04be908eb2b5886d63f62a98"; + sha256 = "0b4p41kv6m0hi1rh2z0711s8mklrnjsdddx9fgvmjm2ajh3qcfh3"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8187,12 +8224,12 @@ final: prev: 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/"; }; @@ -8247,12 +8284,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/"; }; @@ -8331,12 +8368,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-07-01"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "965f10569d033c4e704327ef9a22d306ac20847a"; - sha256 = "0zc5dd65bcm85nwvlc9vpfzn0n7pn1xl80lm2f76nn1s4hzzxzzf"; + rev = "401c0498689dcaa54b2e7483d823e33cdc051e72"; + sha256 = "1j6y0mv56ykip6cf9n4pragqxbcb73p3zmj6n7h3ppsncs5993ma"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8355,24 +8392,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-07-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "f25299bd83f4257d0e4d00bcb90578ddd248ae3a"; - sha256 = "0cww81nmw9wmqr9zyvkkfkagjg0v7lp1nqgnkz7m59gd2mj9szvc"; + rev = "02a0ac1e16a7190a22bb6e31b15d484442bd2fdd"; + sha256 = "1cvvzkd87piydlqik6wswwlpfr84p2alwhg61xf9iss9zphyi52a"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8403,24 +8440,24 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-25"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "49fae98ef2bfa8342522b337892992e3495065d5"; - sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; + 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-07-21"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "b17d85c086d963852b7e3f543e0cd187b5112bc5"; - sha256 = "0cnmmsiq3pknsa1kmh1i7qb5a97ysir86a1k10idzw3qfjffsjnz"; + rev = "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e"; + sha256 = "0bgz7jgjwv08c48fb3blzqxi68lhhj8qpw60pipcapzjhv6qxds5"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -8475,36 +8512,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-23"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "8b2c5c678be4b49dff6a2df794877000113fd77b"; - sha256 = "160sk29hg0xqg02q26gi27h9si9ara4ljazqrd280igvh32xpyj5"; + rev = "48d0e82f9434691cc50d970898142a8c084a49d6"; + sha256 = "1j59d696dn87bqllawn2l0n0092f20ih99a69sgjaqw31fz4cq3h"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-07-02"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6cd4ce6cab184e8787f164a182954534221f2af2"; - sha256 = "04r0gd33fkxchhnd2cdfln6g0zqn8nkad1ik5f4v06k6mk3fy729"; + rev = "d7353a6b72008b38aa873ace49aa97bea257941b"; + sha256 = "151yrgddjaym52jwc65z036m8jncf7ndfycdj899xc2raw3qac5s"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-07-02"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "cc908326c93473041d44398d5ebfa2bb4169d649"; - sha256 = "0gy1d7wmqvij8g5xrh5w1w5mr74sz0f4x704526wf8a40b7hpqz8"; + rev = "2aba92ceb1479485953007f4d5adf34d0b66917e"; + sha256 = "06lrkpsqdy56i4m82q4jlz5nlbrcn77pm8fcbvks3vyzykpwid58"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8547,12 +8584,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-06-05"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "34867c69838078df7d6919b130c0541c0b400c47"; - sha256 = "0c8f2y8glhsbd2nbb0iwjly8f07mjy55z3j53l0p360dgj23kmpw"; + rev = "d45a1150580745a1905d74185b544af3ea6f709d"; + sha256 = "0gbb4hdwypffrxk2g7h09f7rd050g9knbzlwnr55sals5xhf1ngc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -8571,36 +8608,36 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-21"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1"; - sha256 = "0nyrbgr0dl85i6ycyjlrzihfqz5g2s7arndhd6vlgf5xg2yj0gdy"; + rev = "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3"; + sha256 = "0x39c86cf84ap4zmk5lb1bflcrq2zqr2p3pcfd2mjbslzcdqkasp"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-07-03"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe"; - sha256 = "163nj4y192ik63a4c3d8z6qpxyic6xflifm5nnhq0plzws4hqnc1"; + rev = "6b5f95aa4d24f2c629a74f2c935c702b08dbde62"; + sha256 = "1fqncyiw747s6dq9kjkz4d463ni18liik8c559alx0avhfsrrp5i"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-06-06"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aa2e676af592b4e99c105d80d6eafd1afc215d99"; - sha256 = "1311x43lsfkkqa22xzqnas76p3qqhwnhz5xa77gkry5k43jnycyy"; + rev = "4cc3ba9303c0708b81fd681786a4835fd31518ac"; + sha256 = "00v2rxfrj8xjgrk41hz6kan66358byxccyyz6nxyjxa4f0bd77c4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8619,12 +8656,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-06-09"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "c0cfc1738361b5da1cd0a962dd6f774cc444f856"; - sha256 = "1fwc0xrg07cr7x8cgksckqlkwbjl3nh0qvailp89zd35al9pzw4g"; + rev = "3722e3d1fb5fe1896a104eb489e8f8651260b520"; + sha256 = "1hb7qm3z5m20m4lyq57pb8jmydsssmj0zfpsi2nry0skyfaqrrad"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8667,12 +8704,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/"; }; @@ -8703,12 +8740,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-27"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "e170641143704068233ba1d301e75684b67fc07c"; - sha256 = "06z445zphqz7icz65gajpj17c4g133kivnv59jw73d31rvja3jzj"; + rev = "14e0427bef6c55da0d63f9a313fd9941be3a2479"; + sha256 = "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8739,24 +8776,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-23"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "7731ca4e31b32c176a383642ffcd7d593ac17774"; - sha256 = "1gfwplw9zfxlx04b9sa0ljya1900qkdd992sn771ifnmkc4zhl6f"; + rev = "aa5dfa573220a0a511a25ee14ce1570b6c23e56a"; + sha256 = "17n2c9arihdy1qh7wn133h03wm12n7jbz09gg85s29c63w6sic4x"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-07-02"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54"; - sha256 = "1aw3ddn2cg9h0z5cxmvpyjs29crhr4sb1yfs0481m0sprfqi6ywj"; + rev = "fcca212c2e966fc3dec1d4baf888e670631d25d1"; + sha256 = "1lr5zll5662x4clzkf4a6ak2izgwla53vf5vsabcpdhm862qc7i0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8812,24 +8849,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/"; }; @@ -8848,12 +8885,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-07-02"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "69256ee61f29727760c3d28020baf1e7b951fa12"; - sha256 = "1xy3kz5ng0lnygvgw4wb6rs40hn7j217pfv5qsdkl89jrlq9cjsf"; + rev = "c825a3490dc3f6fb413607ed2602c1280a127756"; + sha256 = "01wzw4cykgq8mwg4yi5smfcpkg0q1zvbvmbdk0gyck3cg09s9mfs"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8932,12 +8969,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-07-02"; + version = "2024-07-29"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "7a256b5a87e8c81a034661e9904c739f89961323"; - sha256 = "096ya9zqqhdpg25xwvdn05zw0q40nk27byprfr0bq1g6q71x3535"; + rev = "de02a0cfbe3484accb73025b6dd71b2cc4ae3eff"; + sha256 = "05jj52dz4436cygy5iqhayma24bnafbchjz172cdcm0bivnh7vdg"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8956,36 +8993,36 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-07-01"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "e8787988f2f51dc4678aa13c4553613fff0132b5"; - sha256 = "0a967hspxg2r8rzj02m8l0n8b6y47gg9p56jm9m5z9jgzn6s5039"; + rev = "837f258040d0174ff8495584088046f98499b1ac"; + sha256 = "00hfsnpzc9lkxb35grlxf7xzh4m3v83n8am32g2mb8qn1xa9l1cy"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-06-05"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "028e0bc8ad3d511e9fc1f0678594a608eb908ee5"; - sha256 = "1ng8pg64cvgaagx8dri172z9qwv34ld4293amy48fddm9xxgmdqw"; + rev = "2175b6da5b7b5be9de14fd3f54383a17f5e4609c"; + sha256 = "1mlk5i8xrw32038g7s67pl3xy1647ns7nb2ax59my8a9nw1ndhak"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-07-01"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "8bda5b073de30533e04f61b661cb7c22d7fa4f23"; - sha256 = "03i9lvsr01ml76l1m0dzvbgwk9k25lajmgxazqn5i282s2d6bb35"; + rev = "cbcdcbae3704c21d3ff96a1927d952b8a966b08a"; + sha256 = "0fn57csqmj946rjr5dypcngbpbjh0pay1b1ncc7ij310invgf7kq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9005,12 +9042,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-02-18"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "45acce5b12ce824332d8000cc2c91805b6710446"; - sha256 = "19aaswkjx7q85c091p80zypx6az0m5z2jccapng5clvh2j4qw7qf"; + rev = "018bc10e28b00e28e239b1fff7c497304f8b1bf5"; + sha256 = "0i7hvr8gp4jf7jrds7fa8h09gs8763802j515f8l8q9pa5nnh4s6"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -9125,12 +9162,12 @@ final: prev: 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/"; }; @@ -9197,12 +9234,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-06-24"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "1592944444513c208ab5a087397ba987932af750"; - sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24"; + rev = "8fb95a3ae4354ca2322ef24803d8960fce519eb0"; + sha256 = "1wgr7847fhhq5m062cprdxpnbq3ldsywysa3hbsrvs36r63cxvm5"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9280,6 +9317,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + precognition-nvim = buildVimPlugin { + pname = "precognition.nvim"; + version = "2024-07-31"; + src = fetchFromGitHub { + owner = "tris203"; + repo = "precognition.nvim"; + rev = "6772d3a6aa98f6e68b53fd7d4dfd7762bf3ae3bf"; + sha256 = "0g7vp64x7ip46n44q2j3d8xprs8slkwj85ar3x09ki5d4mp1kzjb"; + }; + meta.homepage = "https://github.com/tris203/precognition.nvim/"; + }; + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; @@ -9354,12 +9403,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/"; }; @@ -9439,24 +9488,24 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-06-30"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "09fabb62d414e56ee3245c558aaedbdc662b6493"; - sha256 = "005lf0iq0gfkxvknkw727h516kd4ghd5nc9cayxayjlpvr65gnm3"; + 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/"; }; @@ -9499,23 +9548,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-07-29"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "5c9660801ce345cd3835e1947c12b54290ab7e71"; - sha256 = "0jm02hp7g5pqfrv2jr93gd4zz8v33w4cb220m7akq07gwhj7fag8"; + rev = "a727bd368e70808125b7cf589328cc595faf3d5a"; + sha256 = "1x5bw1kb1nqbz07jjj07bp3vqcr2h9sn61xrr86v3im37akzlg2f"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9594,24 +9643,24 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-22"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4"; - sha256 = "1fajahgd20cn75xaz4qq0dhvqr2rqr788l874n9qvk4mq4qqvnj2"; + 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/"; }; @@ -9772,18 +9821,6 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - rustaceanvim = buildNeovimPlugin { - pname = "rustaceanvim"; - version = "2024-06-29"; - src = fetchFromGitHub { - owner = "mrcjkb"; - repo = "rustaceanvim"; - rev = "af4de6a35d128ce71c75a9a7846bf089aea76f50"; - sha256 = "14hxzaxsasrfridhkpsa8wva9ych633n268mlipsmibyq56i5isv"; - }; - meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; - }; - sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; @@ -9834,12 +9871,12 @@ final: prev: scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2024-03-31"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "86a0f5b594b08b2ad65f470ffdee81654942b6ac"; - sha256 = "1fx4n8hvjm1yhbrf0dnh8pln4xr8sqkw0x1c9ij4rfd7iq67a5zh"; + rev = "5e3f5ead970317b2f276d38dc031cb4bc5742cd4"; + sha256 = "0l4xkjbw42vwmj3j7dgca3pwlv78dsscbxrdz1jz0i381s2inar6"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -9966,12 +10003,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2023-11-18"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b"; - sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z"; + rev = "0ce899109de52c9af1c78abeab945b74dd81904f"; + sha256 = "1xgwcrs2f4wj1scj08a7zrg8jbm2c8ic9yk0jamh82sjxv8cqhdj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -10015,12 +10052,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-29"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "e186518f9d7eb4b1e43fbbe0c52bf323637194d0"; - sha256 = "01qfr9qiq39qg4d4a3wv2i6i85bwlr77l7h54xfsa3n98h93vlhh"; + rev = "dbd4d7212d6e9d180ab4197a52cee2ba31b2b749"; + sha256 = "124f84x62aa49jj1bkwadgqzakc2mllc7vpmcixb8dzsmhqwhdkh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10099,12 +10136,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "16fa31a410183ce945e58d834a74f161a2dce5aa"; - sha256 = "0sa82fcibwwp3dvakqd9wa0lkgwgi0hr89ffal2y3c37lslzvm4s"; + rev = "598d29bef1cdea1eef4749c96824af0ae2f9350c"; + sha256 = "12q9zi5vn5mvs4kl8r6wfsk4l66f7lmk9yx0acyvszl3isgyq085"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10231,12 +10268,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-03-17"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "9b0c30f61f13ba4800a11107648bdd748ad511ba"; - sha256 = "15a3ib947yihdbc9i2i1a8ml4vhfff26lj5y0z7192g8qhw58qlh"; + rev = "cab1e6331a170403d227a31b5e63759214c37a8d"; + sha256 = "0wy9v1cw4dhmvgnp6g3vrlm6wjmhkz8md6n38qf5ma7brz63qidi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -10354,34 +10391,34 @@ final: prev: pname = "startup.nvim"; version = "2023-12-20"; src = fetchFromGitHub { - owner = "startup-nvim"; + owner = "max397574"; repo = "startup.nvim"; rev = "c6ba324f9eba0c23b675b53af431346aab893268"; sha256 = "0vp4vfrlb39z4s4617v1xkzjkx6l5sxfravfj2wkkwzpjrqfs2bl"; }; - 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-07-31"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "d6f7f5437c5404d958b88bb73e0721b1c0e09223"; - sha256 = "0qv4prxfgzn740jjhscafi7dgiirm1w4h2f4ph74j7x28yk94dlk"; + rev = "93d8bcda516fc86e11c03f9ef577bae9a72fba0e"; + sha256 = "0cc0v0jfdgw9pd27l2kn5fargpcgw6vp3qlg0vbyknizhy1a6326"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.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/"; }; @@ -10400,12 +10437,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/"; }; @@ -10422,6 +10459,18 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; + supermaven-nvim = buildVimPlugin { + pname = "supermaven-nvim"; + version = "2024-07-17"; + src = fetchFromGitHub { + owner = "supermaven-inc"; + repo = "supermaven-nvim"; + rev = "d71257f431e190d9236d7f30da4c2d659389e91f"; + sha256 = "00wmbl3882j2nydy38mgcar73x7im8qyiw7svi0dcdb108yqi4xz"; + }; + meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; + }; + supertab = buildVimPlugin { pname = "supertab"; version = "2024-06-07"; @@ -10472,12 +10521,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/"; }; @@ -10521,12 +10570,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-06-10"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "229605a2ccf36798f77eb7d1b55b5905df487162"; - sha256 = "1pdzjxrd2938r2slb67dw1hrm23dsx9h8dvx288ian040prbpyf1"; + rev = "43d61e7418c062c18b67b2136fcc564426f08db2"; + sha256 = "1snhf1shnqc4ybx19f1vf1jz09vwsjn5flqbjq1g65nm03m176kk"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10610,8 +10659,8 @@ final: prev: src = fetchFromGitHub { owner = "godlygeek"; repo = "tabular"; - rev = "29a6b21dd991477a9e137fe8891947e2f2e8bb45"; - sha256 = "0q76w0xj443fn5a22wksp14f3s55ll2xq0rbdaj37xdd8kddlg8s"; + rev = "12437cd1b53488e24936ec4b091c9324cafee311"; + sha256 = "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"; }; meta.homepage = "https://github.com/godlygeek/tabular/"; }; @@ -10630,12 +10679,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-06-06"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "0815b5455c792a610d28ff3e7981642c9cf05d62"; - sha256 = "1vdj7ardgbmpj9qjfb5r2yp5avscny6v14p6552jphbyqkczd9pb"; + rev = "bc087d88defc0a63df3cd9284c2ecf4fcae42ce9"; + sha256 = "0hr777yshkvkyj4bvlpz8iz3zv53lh6v84bfdkvkfz8dnsn6vhk7"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -10666,12 +10715,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/"; }; @@ -10739,12 +10788,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/"; }; @@ -10763,24 +10812,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-06-09"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "a7ab9a957b17199183388c6f357d614fcaa508e5"; - sha256 = "0g3wh4bspjwmzrd0gl5wwkm6lscbaih8jqzhxzlnbbxk8aky75fr"; + rev = "a46780830b576049c675680650f773bedfa8677a"; + sha256 = "0z0brmjymb0gcfmmlyiiq9ixd4hvf93h856g0g2hl37b19n2mdax"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-21"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "f3f93253797714aecfb95ef7e25f8ff7693430b9"; - sha256 = "1kmikgn75i93ajbi9v9rdm2v2z4gnsslfq9acy2h7lrzng4z9gav"; + rev = "25d01edae8a2d74bcaa706c003b2712bce1e3301"; + sha256 = "01c9j4z8ihksr4cz3fhdk78bc392sybk3nhm254x95cbkzmdrfky"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10836,12 +10885,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/"; }; @@ -10860,12 +10909,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-07-01"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225"; - sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h"; + rev = "284fcbcf67a39df45288582625689db2d2ae400d"; + sha256 = "0mikidw4n6dg3vxa7vfakqvjkbhih8hj4qscwpf051l7dkbmf0lj"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10992,12 +11041,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-06-23"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "3f565ad0c0643d6592b5c3fc44b09b4fb2badc21"; - sha256 = "0xcg0wj45ijkgrpgv6vr4qx2rpbm6v94sdjcwjv3ghh16hh1wc3n"; + rev = "9c23e2fce1c0c7445f68f7765e5f3e512920184b"; + sha256 = "1cf2pwkbdnsm8qaqizjcidn12sfgn7yamxxr87h13cy5jl9v861x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -11005,24 +11054,24 @@ final: prev: telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; - version = "2023-02-08"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; - sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; + rev = "76386e0f8ea417f69ed42751d2008471a88e5ff8"; + sha256 = "025lmm6mhzjj3d1ph05cd51xmk5jkn7whdhd8mx4gz6k4s6894n7"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-07-01"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a"; - sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk"; + rev = "3b1600d0fd5172ad9fae00987362ca0ef3d8895d"; + sha256 = "16lnbb8cazvfb69vg71gcj8f60dkmms0vnpc00z0c3fjyg6wd50p"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11039,6 +11088,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"; @@ -11077,12 +11138,12 @@ final: prev: 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/"; }; @@ -11137,12 +11198,12 @@ 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/"; }; @@ -11221,12 +11282,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/"; }; @@ -11245,12 +11306,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-06-12"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "51e10f838e84b4756c16311d0b1ef0972c6482d2"; - sha256 = "06kbz52ddr0nkvzm92c71wghm1kngwa3bnn329k6wl13qy2j7i09"; + rev = "8f45f353dc3649cb9b44cecda96827ea88128584"; + sha256 = "0f6ranmfx33cvymigxyvrz4f8jb8k2k9mhlq7fqi5bl1ash0add7"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11270,24 +11331,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-06-25"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d"; - sha256 = "12mcsq0dbzhvwq5sq5ijq9cdjxgcr3c72r6zhlgr0pcvarchl7s9"; + rev = "8ed0f52006d3207ec6c94de7db62da840937ef2a"; + sha256 = "0w57bwci2fjm1a2z65d9dd3pj4fq90a7qj1pcf209j24xzni9sqv"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-07-03"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "c8177ab6fe216f121cc0c4f59e7f1ce59670ce41"; - sha256 = "00sm68wswk2gc2sgaww6x9klbdiz69sx18a9zm9r2if41ymabyzc"; + rev = "b0e7c7382a7e8f6456f2a95655983993ffda745e"; + sha256 = "0l61q9mardc0p0pg6vrmp08man2mah385ldq1kpkc19y7s9s85hp"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11330,12 +11391,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-05-28"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "f98deb33805485b56a8d44d1a27d16874af00d7f"; - sha256 = "0w20crwgnf2l8hl71hq1drif2czc2yhbac2m50lgrf6nk8s7x4i9"; + rev = "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2"; + sha256 = "0wjhhzs65myl3hrwi12v4vqgjcqdmkh5cczpx164vcxkqa0zz06p"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11379,12 +11440,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-29"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "e5d0e04121c662ce29190a57dd03655d43c59d44"; - sha256 = "1mqdsy0ainbq7rrr5jf1skw6akyr222krgajawzxbzx696hj46l0"; + rev = "6efc446226679fda0547c0fd6a7892fd5f5b15d8"; + sha256 = "0s0b462qzhsamnhvxnzm9lj1fxp0q28w94aa34hf9ayarn4fpgvm"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11415,12 +11476,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/"; }; @@ -11451,24 +11512,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-30"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "5da4d695d66f676eb6ea766b946e86f93baaafe7"; - sha256 = "0pbk9svffxky1yrl7r7dlylj8iqadbs5zn5iz24fglsv1c72ldjk"; + rev = "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7"; + sha256 = "1ha0mmzqhmhrs2y0llrqfnsq46p9xrdn9cx7an1mimnz4xwgyqgi"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11511,12 +11572,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-06-10"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "035d92eab05ac1390afef7204e3fcad9a50fa443"; - sha256 = "086lmfrllhnlx5c6ksi0lx287zfi86vlazy69sqb0876d0lfn2gs"; + rev = "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3"; + sha256 = "1g1mpgkjxla0lhdsn6z81zcm66zf56zps6na3f6r36jn2ii1rm18"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11547,24 +11608,24 @@ final: prev: 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-07-02"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "a74d4e8cb9cd860ebd79e348f8012f57625e2239"; - sha256 = "0m8dc3lixww9x9zasxf2n6g00jimqx6mzlszmggmawhj52sg76gj"; + rev = "f63cfbeadb199bf5426e24457e20d869ccc4e1b9"; + sha256 = "187hrd6pp1pa9p8vd3r271x5yanjvj94149pih8hqld07ian6ai5"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11581,6 +11642,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"; @@ -11655,36 +11728,36 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-07-01"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "225c0552f55b443340eaf5505f6bee3b83fad54a"; - sha256 = "1xbiq6n1p8j8sh0yx14nxynsz26rll2ax5hwrcjc6g8ahgj38sz8"; + rev = "d44bb199ed3a47891051a1d4cdd4d33b9d1267f9"; + sha256 = "0kfl7z86vzlbhvyilf8s6bdc3ppz9ab7gjiv29bpkwggaqavlc1m"; }; 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/"; }; @@ -11835,12 +11908,12 @@ 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/"; }; @@ -12003,12 +12076,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-06-16"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "02894b6ef4752afd8579fc837aec5fb4f62409f7"; - sha256 = "07jxqibg8zdir3w5lq2ibjvf6zw9b9386y9pwybgzg91c9pvd9xk"; + rev = "d25c049e617775eb2eb26c580e5dec591c94d480"; + sha256 = "0pq63f30cqsbq4q669h6ps64hxz05a2b7z3i09lfj0fpa1a27p0h"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12723,24 +12796,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-06-19"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d"; - sha256 = "0v7djs9q69aglh1gpvynbzcvaxf5fk2jh4kx9ssmwlh2070qqk8b"; + rev = "c3ab458fb7c94c2fc4baae4e2cd5601eec9d27bc"; + sha256 = "0kjawhzipwqk8cwbna5frh1mvj026affp1bky2crifvx981zls00"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-06-24"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "2527310098e7458488e61a528614da142aa2dc42"; - sha256 = "15zjqzpap035g29f0rf0yw9017r6aapv8w351ikaivfdp05ypdbr"; + rev = "0f51d8de368c8c6220973e8acd156d17da746f4c"; + sha256 = "1pb61wwm7vma4dilxryyf1bzq05yh35chlnqfng0wxr9b9hj8r7r"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12963,12 +13036,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2024-07-01"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c23000a030bf14f721d10c0d74e5f8721ac2f9cd"; - sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; + rev = "753fc863e488bd09580221d7829c3e4735a99fdb"; + sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13131,12 +13204,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/"; }; @@ -13155,12 +13228,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/"; }; @@ -13227,12 +13300,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-06-13"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "255631abf7ea132393fc7dd745d6911c37ac6a4c"; - sha256 = "0k92fs7wq1yhbwgf29awv70k06nb36x375b4rjwc4sf559i223mc"; + rev = "dd7a1cf09d034ffa063bedfef4f13891eff06f3a"; + sha256 = "0w3p2vxc3rk1zc4ka4yhv9rxpn57c5x5a82w0257sawhxy0jqbji"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13287,12 +13360,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-26"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe"; - sha256 = "0g3bx7jnyra8ia11k7bqv0j41pwkbdz7bxzffxn20dyc69vkahxz"; + rev = "0444df68cd1cdabc7453d6bd84099458327e5513"; + sha256 = "0sx67lwz1f6kd2751qbbzpgq0hjik1g8x4svp788yvzbjdgdmc9l"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13371,12 +13444,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/"; }; @@ -13395,12 +13468,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/"; }; @@ -13479,12 +13552,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-12-11"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1"; - sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; + rev = "1653be93f32ea529a03eac04ed2bfe46533ac8e8"; + sha256 = "1pv7g2ggjilvgjfnkldp07wdwfv4z3j46qb0pfnf53xn71qk25w9"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -14045,12 +14118,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-22"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "c771fb5f00fd219833600c8164e6befe3c163b9a"; - sha256 = "0jlyy64m6zwvjs3w61vp2zv9rwdds1g3pk4wknvq493fcyxc59wa"; + rev = "b6952c89dde3687202cd397db37dc96344a444e0"; + sha256 = "1mr9pdzvd1fd30wwgz72i8xsi76rycib1xnc8gin0ns6x6795xa7"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14141,12 +14214,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/"; }; @@ -14273,12 +14346,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-06-20"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a8f244a4e9527992acd89c578933ad1d3940d276"; - sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5"; + rev = "356254d6388298017589114a8eff15d20def90aa"; + sha256 = "0pkca4bm0cskwka45l6rn2mfy6cqmab8hs2cay2dlfi9h52w72jc"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14309,12 +14382,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-06-13"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "3debb34bf6fac8e1cb195d9e89a23b7ea98bee47"; - sha256 = "0pdw13m2xn4fih0kk9acbhlgq660a7p6c7ppp4jb310jf0l3xg3i"; + rev = "65749446c8c8556d0c287bcd724084a625913d02"; + sha256 = "1lzxbb8yz92h3fkbsc9ccim6pdnjfj4hdxs6b0iiqi8qq7a87wf1"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14418,12 +14491,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-04-12"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "05d6538ccef1d33f2d26f2515c0eacaa93d2e061"; - sha256 = "0x9vq6qi7m532la56i9pnp9l4q1s7iy1g7w36451w4c03lsw39is"; + rev = "9b6ff787fdd50299e18c8b5bf1b5dc319fdbf435"; + sha256 = "1j9xysvwhvp087ak3vvdcbkskkp78hlrr20jbldfx53vys4syagh"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14550,12 +14623,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/"; }; @@ -14934,12 +15007,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/"; }; @@ -15066,12 +15139,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/"; }; @@ -15294,12 +15367,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/"; }; @@ -15366,12 +15439,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/"; }; @@ -15426,12 +15499,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/"; }; @@ -15522,12 +15595,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/"; }; @@ -15738,12 +15811,12 @@ 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/"; }; @@ -15810,12 +15883,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-07-01"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "a4e55d1119689a16e659ce95b673f7174a615637"; - sha256 = "0iba20wlhqvhrsh4nfd2gfm2iwix2zz16f0izmkc2h4q741rp86n"; + rev = "4a76fb65b4255258b3530eea77be24d4d5cc4a4e"; + sha256 = "0af3k752br47s1xiwf3gssq0wxim2hd5j4a50zbns0rz69sn84r5"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16051,12 +16124,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-25"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "34aab77f7a63f20a623df45684156915f6182a55"; - sha256 = "0bvziqnnaimwrrjmz8k701ki4gdvlhvjkj4fxnb77ab8rc0sp13h"; + rev = "75b64f23c923d34b56e47846a026210feb57146a"; + sha256 = "0pz2gh1qhakbshpgsnc6rqvk8wg9n2sdchnkgklpm1s8qfibkhyj"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16375,12 +16448,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-06-30"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "525521677deb8401b62054bbbbc9b17f8486de3d"; - sha256 = "0i8n47y9xg1583908sa8lhkvz146ch65i9afcmgrsngjys1ihaqb"; + rev = "38b0e8d94a5499ccc17d6159763d32c79f53417b"; + sha256 = "03gn3wdi1gk3z8nki6cgcsad2xyabwwczxiip6dxmzmwfbg0s34y"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16471,12 +16544,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-04-29"; + version = "2024-07-20"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23"; - sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz"; + rev = "53bba6bb8342de9cbdafc82142a9b5e82008d858"; + sha256 = "02q2fyinapfr8y0fndv3q7x6ri42nlvpy6qc7cklszx77q4y0a89"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16615,12 +16688,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-05-03"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "96d3400598a95957062e42820cdeaa6ab22cba72"; - sha256 = "1q6wy7mzi4lqjy37l4rbnjbvy7a0cmm2cccd07ywfd2cx31m26w0"; + rev = "121a95905452c59c04f04e9055aa246913650e2c"; + sha256 = "0wbm85adrjqljk1jfad4kydbr5aiv7hq39fs41ka4vr0hxbqd33f"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -16783,12 +16856,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-06-09"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ee3bd0120525978521168eda1c3a64ef24e3cb86"; - sha256 = "0g2zxgafxr90cmc8anvr0d5wkvzbpba8b6jblsdnq93648p38qx8"; + rev = "6dfbe470866c9ddc41288c4463a1389bfa6efa74"; + sha256 = "1h8cy8dkfzs3j72ygvcl2hlv71jp0q7h4gz2k1krsqngxk355s45"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16796,24 +16869,24 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-24"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2dc2a5435809c13f6f4aa07964be4ef19a7864f5"; - sha256 = "1s3w4kbdvwvqmpv82hkdizcr28dyx61mwxfg0k6hkhnpr7fimz6a"; + rev = "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240"; + sha256 = "0kj1nc86qib6n58ds18aiszbnfgqbjk92d5lcpypf1fcfjvyvv84"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2024-06-03"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "fa35410805b82ffabc29e3cb5cdf3ad0b8dc402d"; - sha256 = "0i47x15nzvy6xdgx8kfdbm000c33svanglnn77ilxrv19kjy6j3v"; + rev = "c4ffa0b992798f3362b27642088dccb251aaef1e"; + sha256 = "1n8xlym81442ak4r442k9prc69a2y92nwid2kbynj2v05r8fa0sx"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -16892,12 +16965,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-06-22"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "46212834b32866ce45479f885ca82d2259044f46"; - sha256 = "0lp101ac8ylflvdngv2xmpl8v00djrw4ca6pbrbf5jdl0wm1fnmq"; + rev = "f6c88cdf9d37d5c0bb1e492a13a3b4b4cc4dd13e"; + sha256 = "0v4izydhq4jc6jaw7a38d0w2mlw93jdijaql7y2hk8fp44sn51q1"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16940,24 +17013,24 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-06-07"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "0099511294f16b81c696004fa6a403b0ae61f7a0"; - sha256 = "1n6cs9590n9r24yxm4yf74bqmk1ky6hc7i9c8n7sc4icjkagkz65"; + rev = "6c1584eb76b55629702716995cca4ae2798a9cca"; + sha256 = "0qwwj4r5hvsmsjz352aqa4hv3f9pms6r67c4yh5imn5iyvinrzwy"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2024-02-13"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "34d319e07f86a628deeb237133088f01f8432bc0"; - sha256 = "1gkxw6zhkgjvwg4jcpfiv2xkg7vk0q1prj4sh5swiznmyswsr0ay"; + rev = "e196282cd6b01ff0ce736751146fd4db49a42205"; + sha256 = "15b5f4fcxn837gxhza4dkfa2sm01iay6d1janbp31pl81q0lhacl"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; @@ -16976,12 +17049,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-29"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "e8cf7e92220fc1ed3c20c8744a511b917afba7b5"; - sha256 = "13fic83d631xxfaks2ncda3id5y8dy072sa56nkr9fr7yx9nbw6h"; + rev = "d58c97290d75ac594198a4647cbbb0c5094ce9c6"; + sha256 = "1x1279d19gkn27zx6rqj1c5bmpbqawz8zmadld0k5l4h43m8wz2s"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17108,12 +17181,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-03-23"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33"; - sha256 = "1q0j06lkkg60f62bjqxq7x6a8wxgcqdh1ldi6rp5sg6rkad8kzd7"; + rev = "7aefcc970ea56dc0a89dafdf9f5eb0de7b1ee58c"; + sha256 = "157vdbbrqqal1jhh68bzwvgv3wn12yfmhkjkvwp3jb4h40m974zs"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -17167,6 +17240,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yazi-nvim = buildVimPlugin { + pname = "yazi.nvim"; + version = "2024-08-04"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "yazi.nvim"; + rev = "54ad21d33c329c4dfa33a327257dcdc1048ba586"; + sha256 = "0qka292h4a68mfqk630j9p7skgxqnb998d60p0w1h0508lz66ahz"; + }; + meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; + }; + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; @@ -17203,6 +17288,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; + zellij-nav-nvim = buildVimPlugin { + pname = "zellij-nav.nvim"; + version = "2024-01-29"; + src = fetchFromGitHub { + owner = "swaits"; + repo = "zellij-nav.nvim"; + rev = "25930804397ef540bd2de62f9897bc2db61f9baa"; + sha256 = "07x3z5a1wgil0cmhr0hw7xacgj9cyj6qyf1mb2c9p9dh87ll0j2d"; + }; + meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; + }; + zellij-nvim = buildVimPlugin { pname = "zellij.nvim"; version = "2024-05-03"; @@ -17217,12 +17314,12 @@ 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/"; }; @@ -17265,24 +17362,24 @@ final: prev: zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-10-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "54c216e5306a5c3878a60596aacb94dca8652ab9"; - sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb"; + rev = "ad75bb5752f3556d8bde5b0e69cb69a98058030e"; + sha256 = "0wgjasakkcdzr5zv553gc2x2kzg0778y6qi7rswqbfxxadlkl5xj"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-27"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "15e24e96cb90889ebd12b5dbe800a958c716f520"; - sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c"; + rev = "dbf4eeab55b08856c9d6b6722dbff39630bb35eb"; + sha256 = "1d6qz2yi4d0ccpibjh3c366qh32hd9r646m1b99vy16r27ydffcs"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17313,12 +17410,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-27"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "31fcfb02c47952d5c75aec893b93b2878abe5fbb"; - sha256 = "0n883l071d197xqfji5dj3qgi3dvk1v9vmr1fdr1gnc9fmcpa672"; + rev = "ba5f4153a5dad99505baba936bd0373534400ac3"; + sha256 = "0wfs4zff1q1dxblj9imfbvbkxywc193kg2kmfrfqqfg9x24ih47r"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17337,12 +17434,12 @@ final: prev: 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/"; }; @@ -17361,12 +17458,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-06-24"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "f3e3ba2b47b57fc501b096a38b37bfc12f22f298"; - sha256 = "1ph3g127qynf797vnlq5kramkslj062bjzhpnxcsr9vjsn5a9x78"; + rev = "6d6bae56a002a4da507ba263776e9691f47deb5f"; + sha256 = "103j8jcj82pdzjj06bn0avkm2ng2k83fm95ivc31fjbcd5gp1dmp"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17409,12 +17506,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-28"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "568a0cb8595f1e5363dc220f01ca6f18517ff80a"; - sha256 = "0c3ihcl10mskp5jd1f9xnvypyrf0x5db1gks2i1fb63cmh64ibld"; + rev = "19efaf31cbe15a429cb3ca6ac9c9fce13275045b"; + sha256 = "1kpg8bkjdcna8327pb212dgh5rxij0ahvc30qn7bb5cwjcrfzbp5"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17433,12 +17530,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-29"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "3c9e5cb6499f66a02c365f073145a835124a19ac"; - sha256 = "0bghzwkyqgp3g76irbadv3bx4npvnq2x16j6fdxc01906nn3iz95"; + rev = "967d8b27811f3b2a2ac3fd2de27e5a4992dc0770"; + sha256 = "19ah7rxbrjl92vqa195labbc8kphq3nh4cc84i6n5cykhzv4jskw"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17467,6 +17564,18 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; + render-markdown = buildVimPlugin { + pname = "render-markdown"; + version = "2024-08-05"; + src = fetchFromGitHub { + owner = "MeanderingProgrammer"; + repo = "render-markdown.nvim"; + rev = "af67ac5f95bc7a31e5d2aba5527c2ed14fb8be2c"; + sha256 = "115xfcn9d6v7rim780xhf7a2dx5cx7wbca1lsgy45msm4x9i18ar"; + }; + meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; + }; + restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; @@ -17481,12 +17590,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-27"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "e10c9c6436556405ec6b187fd459a718f5c55156"; - sha256 = "0d7cv268gzrz47brax66h2kv2b4b6ks3vzdz97si8khh70jds59d"; + rev = "e4b08d74b7272cb21e4e9c71b8b9e0830fd722fe"; + sha256 = "1wlr2hm8818f5cdy757kir6vwnh777vrji4hsnzhbbdj3zk9w115"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17539,17 +17648,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - supermaven-nvim = buildVimPlugin { - pname = "supermaven-nvim"; - version = "2024-07-01"; - src = fetchFromGitHub { - owner = "supermaven-inc"; - repo = "supermaven-nvim"; - rev = "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b"; - sha256 = "sha256-TeRWReHeEqP5I3tgfJdMDmHvL83NDCENRMcQrKbPiqg="; - }; - meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; - }; - } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 84865e7300448..4c995c70da184 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=5c9b47c"; + version = "0.0.0+rev=31182d4"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "5c9b47c6a978072808b356065fe8f223cdc8fc07"; - hash = "sha256-nln4A2zIaFvfvWMplMDV3XMlXLEFfqx68GiNoFSR2/c="; + rev = "31182d43b062a350d4bd2449f2fc0d5654972be9"; + hash = "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=c25f803"; + version = "0.0.0+rev=384c55e"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "c25f8034c977681653a8acd541c8b4877a58f474"; - hash = "sha256-j+TyGT5FycEj+E6si7GSKUauvXNvl1L2NEw98jU7jns="; + rev = "384c55ede2a1f13e83d8e18dbef8f11304c379c2"; + hash = "sha256-OEfiJWF3+wxwaqk4kyMSvJG9c6NbyphHG2hnf7fCiOQ="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -193,23 +193,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=deca017"; + version = "0.0.0+rev=be23d2c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "deca017a554045b4c203e7ddff39ae64ff05e071"; - hash = "sha256-uvvARjD4729GO8vpmrhAzheEQ3oz7LYmF8awdyS2/Rw="; + rev = "be23d2c9d8e5b550e713ef0f86126a248462ca6e"; + hash = "sha256-6R9bx0UMjln8W1DrHG1AyA+Ziq9XGuLti2m/bC6lPgg="; }; 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=31a64b2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "82fa8f05f41a33e9bc830f85d74a9548f0291738"; - hash = "sha256-5GkU3/yVMCnNvNssad3vEIN8PlbLeQsRBlwgH2KUrBo="; + rev = "31a64b28292aac6adf44071e449fa03fb80eaf4e"; + hash = "sha256-WBOA6CIW56RuiHhwiuP9R+K2kK6Chfx05TP3mdjMxo0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -325,12 +325,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=7ce8946"; + version = "0.0.0+rev=0b4aa47"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "7ce8946cae4bb25adebe5b50394f702beb007026"; - hash = "sha256-haU0fXNwYh3YaP8VMY1krRHxrGvNkDV4hMcxp5z9TVA="; + rev = "0b4aa47f07d958a49260aadc87e8474b03897c23"; + hash = "sha256-z2cG/woWbpvLJdmlN7ZuPiDwWhHnmwr3speMDFz3cEk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=b93070b"; + version = "0.0.0+rev=7c97acb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc"; - hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4="; + rev = "7c97acb8398734d790c86210c53c320df61ff66b"; + hash = "sha256-E5bXdBfCE1lP5GngZBZ4qn9kKPQYVDvdvE5UPMoUsas="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,12 +381,12 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=750dde9"; + version = "0.0.0+rev=ac58458"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"; - hash = "sha256-Epw1QW4WS1le8OdQI0soO0VaDOgNveh7WTL4sol/cQU="; + rev = "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e"; + hash = "sha256-+6+9x+5pyjv252X3XzpN2CnrUXVzMvaCrCPVhhjEELo="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; @@ -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"; }; @@ -503,12 +503,12 @@ }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=5a86415"; + version = "0.0.0+rev=b0a9bc5"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "5a864159ff728b6d4f7d0aab3723f85a467d180f"; - hash = "sha256-w36h/4xGtGZpJu+ueZiO6K4Eln0DkNUw6a626urMbz4="; + rev = "b0a9bc5737340a9b80b489fe9ae93d7b2fe78cd7"; + hash = "sha256-dIpoLqfIb+vsxe2DszOAKztL+YTDAVGlNccYhYe170U="; }; 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=fd0d64d"; + src = fetchFromGitHub { + owner = "ValdezFOmar"; + repo = "tree-sitter-editorconfig"; + rev = "fd0d64d2fc91eab903bed4c11ce280b62e46f16e"; + hash = "sha256-7Q8+XEGWqOnkLW7b9Vnubr2LhvdTK48at45k/Gsm9Us="; + }; + meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; + }; eds = buildGrammar { language = "eds"; version = "0.0.0+rev=0ad62cb"; @@ -603,23 +614,23 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=da275db"; + version = "0.0.0+rev=8f41b58"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "da275db3ae46bbd00f97d11f888d8c58c14faa6d"; - hash = "sha256-05V1VLmafWgdAHaNiBj4YYl9/W54j6TNSH5CLnh0fjY="; + rev = "8f41b588fe38b981156651ef56b192ed3d158efd"; + hash = "sha256-B/SF86W+0t6rVzo/QpQ6QQPsD7pH5dHGLCqxzoIhNTg="; }; 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=6b63343"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f73d473e3530862dee7cbb38520f28824e7804f6"; - hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds="; + rev = "6b633433fb3f132f21250cf8e8be76d5a6389b7e"; + hash = "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -779,12 +790,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=274e27e"; + version = "0.0.0+rev=bff4b66"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8"; - hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y="; + rev = "bff4b66b44b020d918d67e2828eada1974a966aa"; + hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -823,12 +834,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=02a17bf"; + version = "0.0.0+rev=426e670"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "02a17bf9d0553406268cdbf466d57808ae712bf3"; - hash = "sha256-rZPe7rrnPa4QGnFUjwoaj/7HJzNDSigc7w4gJEFXZD4="; + rev = "426e67087fd62be5f4533581b5916b2cf010fb5b"; + hash = "sha256-SI3/gUksiRgUpCabsll6g0mUcm5iiNMTzxlxQxCujpY="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -845,12 +856,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=3736dfc"; + version = "0.0.0+rev=ddc3137"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "3736dfc811c07fa749ca818f94c9a3977734dd26"; - hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28="; + rev = "ddc3137a2d775aca93084ff997fa13cc1691058a"; + hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -887,6 +898,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; + goctl = buildGrammar { + language = "goctl"; + version = "0.0.0+rev=f107937"; + src = fetchFromGitHub { + owner = "chaozwn"; + repo = "tree-sitter-goctl"; + rev = "f107937259c7ec4bb05f7e3d2c24b89ac36d4cc3"; + hash = "sha256-4I0T+CoMCo3e7hkpdR+ipMol0THbJYg+UXAnIa0o5Ns="; + }; + meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl"; + }; godot_resource = buildGrammar { language = "godot_resource"; version = "0.0.0+rev=2ffb90d"; @@ -900,12 +922,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=bbe2fe3"; + version = "0.0.0+rev=1f55029"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "bbe2fe3be4b87e06a613e685250f473d2267f430"; - hash = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI="; + rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c"; + hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -966,12 +988,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=6c5c881"; + version = "0.0.0+rev=105ee34"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "6c5c8813233fe326e24c5ef032858d13f8006a8d"; - hash = "sha256-NursRJ7DBmlbA7EOzC+WwoxDkjMUZYANcdX48DyjEIY="; + rev = "105ee343682b7eee86b38ec6858a269e16474a72"; + hash = "sha256-HYb3TXMSC+Zfss+vqgdSxsB35tqPmc6GNMWuFof9e5g="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -999,12 +1021,12 @@ }; 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"; }; @@ -1043,12 +1065,12 @@ }; 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"; }; @@ -1077,12 +1099,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=80517ca"; + version = "0.0.0+rev=81dbfa4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "80517ca13317fb8591503c0d99f2ad76e8979a72"; - hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8="; + rev = "81dbfa44a2e0f9e36d16f449fc792020e2f38426"; + hash = "sha256-uhCBhS68J6gxWxv/Ehk6OOo3/UMakf9Rrr3JnYAUD/s="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1143,23 +1165,23 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=2dacda9"; + version = "0.0.0+rev=5ae6c7c"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "2dacda923bafcfeae487e457df0fc1c95f6d1848"; - hash = "sha256-JunYDINufbrbVduLrrX73rD8L6MC5dEie8yq92qTFe4="; + rev = "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5"; + hash = "sha256-C1U0vyW237XB8eFNYcn7/FBsGlCLuIQoUSlFV8K5TsM="; }; 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=fba6ed8"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "ad705af8c44c737bdb965fc081329c50716d2d03"; - hash = "sha256-Pdk7wGaTtQHola+Ek5a7pLBfRUEJfgx+nSunh7/c13I="; + rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08"; + hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -1176,12 +1198,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=966797b"; + version = "0.0.0+rev=1a6683f"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "966797b8c581526efdd2252f815dde6de1a8f932"; - hash = "sha256-q2aBAXUVjhcoHH7iZQllLkDF5ZMuIxNjWu72Xt+YdXA="; + rev = "1a6683f6809f7bc630f10fcad7d9ac6471deb706"; + hash = "sha256-eDoERNfSMzpbccX438H2c1AWQMXNm9tJBnCREYqMvic="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1220,12 +1242,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=3b08641"; + version = "0.0.0+rev=ea842cb"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702"; - hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs="; + rev = "ea842cb57a90865c8f50bcb4499de1a94860f3a4"; + hash = "sha256-0gy4kylOoaC5BigpppAN1va3eRZaS6UmxNcQkbxz1Ag="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1242,12 +1264,12 @@ }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=391a8fc"; + version = "0.0.0+rev=12e4537"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "391a8fcc48a11f63bf18ec9885f6f069e760949a"; - hash = "sha256-GOIhkoiiUhkTpUhDm/sfLtsNhOrVoGx2uiXEteruT2g="; + rev = "12e45374422f6051648717be62f0ffc40a279ee2"; + hash = "sha256-KBEJFpOIP4MFbkxcIF2HsHvwblTdb2UuisKMn4Pnm1w="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1330,12 +1352,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=379fbe3"; + version = "0.0.0+rev=6648ac1"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"; - hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8="; + rev = "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"; + hash = "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1363,12 +1385,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=c9cb850"; + version = "0.0.0+rev=8d9d372"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "c9cb8504b81684375e7beb8907517dbd6947a1be"; - hash = "sha256-fuEKCtCzaWOp0gKrsPMOW9oGOXnM2Qb652Nhn1lc1eA="; + rev = "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5"; + hash = "sha256-uaoFBA8rLhlzmDQ9sCbBU5KRSb63k1DSa6VvmioRSNw="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1407,12 +1429,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=08d8b88"; + version = "0.0.0+rev=efe5afd"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"; - hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI="; + rev = "efe5afdbb59b70214e6d70db5197dc945d5b213e"; + hash = "sha256-4sFqboyE94yvkZYKw5wgQjdVkNaIGLif3qB8GMCEBE0="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1452,12 +1474,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=0419ac4"; + version = "0.0.0+rev=7862a34"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "0419ac4868585320eee8615c90b864a1b04ef433"; - hash = "sha256-1FPDsQSPM86NvMrmxIOVnIC65bUOFtKEwRuAtMDbw6M="; + rev = "7862a3424832c3a9d45eb21143b375837bd6573b"; + hash = "sha256-F/nP+zXySjKHX9Y9zqexhwn02sZejUXMPDcWRh6s7Yo="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1529,12 +1551,12 @@ }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=9e082a2"; + version = "0.0.0+rev=e128454"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"; - hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ="; + rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3"; + hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1575,12 +1597,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=2825fb5"; + version = "0.0.0+rev=0d5a05e"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "2825fb578325ac308945318881445a89ea06e0f6"; - hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y="; + rev = "0d5a05e543af2de60cdb5e71f0f5888c95ab936f"; + hash = "sha256-B5BoHezwfUW156S5ixOGukjX+qFGLmS0WqxpT0MVNG8="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1619,12 +1641,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=268bc99"; + version = "0.0.0+rev=affbd6f"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "268bc99020f7ba7a219f839e3a6a31c36ad0826b"; - hash = "sha256-jXcnM+LEY35GZd2HYtFE5Of4CBga1zZuGCPazKWAppA="; + rev = "affbd6f3b08155826a22cfa8373147acbf60f1f1"; + hash = "sha256-zIbtvtpLQmXhFj5KDQRwsUJfUi6AkZjfp55n0X5lN4o="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1651,6 +1673,17 @@ }; 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=3039ad9"; @@ -1664,12 +1697,12 @@ }; 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,12 +1730,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=0fdada1"; + version = "0.0.0+rev=68d3b79"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"; - hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4="; + rev = "68d3b7999ad89d31690461884270e5658e0a22c4"; + hash = "sha256-EMkhmAGi2NPTeliGZyWo/UtYJnNJAkp04/LMs4DDF8s="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1752,24 +1785,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=cd95a67"; + version = "0.0.0+rev=036226e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; - hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; + rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; + hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=cd95a67"; + version = "0.0.0+rev=036226e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; - hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; + rev = "036226e5edb410aec004cc7ac0f4b2014dd04a0e"; + hash = "sha256-p8e4xfcGXDzpgheAWG+fSUKCpqEsSrHw9waoTRNnrnI="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1817,7 +1850,7 @@ rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; }; - meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; + meta.homepage = "https://github.com/Isopod/tree-sitter-pascal"; }; passwd = buildGrammar { language = "passwd"; @@ -1843,35 +1876,35 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=309cb8d"; + version = "0.0.0+rev=3a21d9c"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"; - hash = "sha256-eMmU6qkg9ZVjtxaW1tSPhqsPe2WX3/frPfqMxXCziyo="; + rev = "3a21d9cb2a20a062c17f8f53d5983fd473c4673c"; + hash = "sha256-cBF3wvAl5PJCzjlTn1wx9+Q81xsitKW3+TwD0yAoWM4="; }; 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=c07d697"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; + hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; }; 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=c07d697"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546"; + hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1942,6 +1975,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"; @@ -1966,29 +2010,27 @@ }; problog = buildGrammar { language = "problog"; - version = "0.0.0+rev=d8bc22c"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "foxy"; + version = "0.0.0+rev=93c69d2"; + src = fetchFromGitHub { + owner = "foxyseta"; repo = "tree-sitter-prolog"; - rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; - hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; }; location = "grammars/problog"; - meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; prolog = buildGrammar { language = "prolog"; - version = "0.0.0+rev=d8bc22c"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "foxy"; + version = "0.0.0+rev=93c69d2"; + src = fetchFromGitHub { + owner = "foxyseta"; repo = "tree-sitter-prolog"; - rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; - hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; }; location = "grammars/prolog"; - meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; }; promql = buildGrammar { language = "promql"; @@ -2092,12 +2134,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=71778c2"; + version = "0.0.0+rev=0dee05e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "71778c2a472ed00a64abf4219544edbf8e4b86d7"; - hash = "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y="; + rev = "0dee05ef958ba2eae88d1e65f24b33cad70d4367"; + hash = "sha256-H6t98tuXJW2VD5Ay+rOfnp9p5ZljyPxvtIy60PycMUQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2191,12 +2233,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"; }; @@ -2255,6 +2297,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"; @@ -2290,12 +2343,12 @@ }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=6ea64b6"; + version = "0.0.0+rev=ef46edd"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "6ea64b6434a45472bd87b0772fd84a017de0a557"; - hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M="; + rev = "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"; + hash = "sha256-H76cnMlBT1Z/9WXAdoVslImkyy38uCqum9qEnH+Ics8="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2345,26 +2398,26 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=599d12b"; + version = "0.0.0+rev=a13f2d1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"; - hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw="; + rev = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8"; + hash = "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw="; }; 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"; @@ -2390,23 +2443,23 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=ea77a4d"; + version = "0.0.0+rev=d84b43d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8"; - hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg="; + rev = "d84b43d75d65bbc4ba57166ce17555f32c0b8983"; + hash = "sha256-KcFntOBXADBu7nSFQ5XVY6/nfSl2uLJfhsfVFFjudd8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=d82ab8c"; + version = "0.0.0+rev=4a0558c"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"; - hash = "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY="; + rev = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74"; + hash = "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2434,12 +2487,12 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=5a7b140"; + version = "0.0.0+rev=46d4de8"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "5a7b14074bca95b25935e865ca8f1efad32317e4"; - hash = "sha256-mYqftgJOnlWgQZrXaNtFXvjRQgC14PXYyruTVw5J8Zg="; + rev = "46d4de8e6cfca8a97c0489aea936bb15beeaf666"; + hash = "sha256-MNJLveFI5oybM9QE8wgYT7k3GK1E4lIOm3xWJmJazls="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; @@ -2480,12 +2533,12 @@ }; 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"; }; @@ -2493,32 +2546,32 @@ language = "sparql"; version = "0.0.0+rev=d853661"; src = fetchFromGitHub { - owner = "BonaBeavis"; + owner = "GordianDziwis"; repo = "tree-sitter-sparql"; 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"; }; @@ -2590,23 +2643,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=7218cf6"; + version = "0.0.0+rev=7ab8221"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"; - hash = "sha256-mS4KxJXXb/EzQB5H+Pj+/SEbCTerGFjKiJah8oAGA8c="; + rev = "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8"; + hash = "sha256-ooeQNwFgDZrn+Vj6nFOS8TJMknl/DgbEghfm0e1EJDE="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=631f1e6"; + version = "0.0.0+rev=769bb83"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"; - hash = "sha256-/nMRcZc5fWUJ+GpVnlERHjtahXGh6NwrNNQPkNM5Y9E="; + rev = "769bb834feb2947f2c706d82830b0a05958727de"; + hash = "sha256-Rqvk1dBEBAnQV/51MUSzgzX0J/pecwA5o8SBOfrvu+I="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2635,12 +2688,12 @@ }; systemverilog = buildGrammar { language = "systemverilog"; - version = "0.0.0+rev=a478beb"; + version = "0.0.0+rev=4f897d5"; src = fetchFromGitHub { owner = "zhangwwpeng"; repo = "tree-sitter-systemverilog"; - rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"; - hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM="; + rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"; + hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM="; }; meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; }; @@ -2702,12 +2755,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=a4f14aa"; + version = "0.0.0+rev=de0d0ee"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"; - hash = "sha256-O5eKY9twQJp0qHjIs6juEY0VtOYXAdnlzlomh9YNndI="; + rev = "de0d0ee129cf643872e8e0d5c4a6589b5a3aae23"; + hash = "sha256-eH2QXynJLM2dBtW4UPXsk+RYFUp+z2SFWaN7KO5cpE0="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2758,12 +2811,12 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=200f9da"; + version = "0.0.0+rev=bba02e7"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "200f9dab6b23f3b9bb8f67fc811221517f56c373"; - hash = "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E="; + rev = "bba02e79f85e335f310fc95e21c677e49f2c4439"; + hash = "sha256-FbOBkEtsFFD9jIWM2+fETstnvQyIj2DAF81v0dXjouo="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; @@ -2787,7 +2840,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"; @@ -2814,26 +2867,26 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=198d035"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; + hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; }; 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"; @@ -2848,24 +2901,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=198d035"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6"; + hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU="; }; 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"; }; @@ -2882,12 +2935,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"; }; @@ -2949,12 +3002,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=e91f8a4"; + version = "0.0.0+rev=7f80a04"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "e91f8a42de7842f24f4ce600754f2b6651985fd4"; - hash = "sha256-38nerR7oZBwxXWd08QqEEMSxAZqXRHCRdLbMEbRhcQI="; + rev = "7f80a0441ff2ca6aa8ced8e1ee87cead9dd26515"; + hash = "sha256-eTYqzdhxVI8jQXZ4FopReVYZJle2D0b31PjkZ2xC4f4="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -2992,6 +3045,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; + vhdl = buildGrammar { + language = "vhdl"; + version = "0.0.0+rev=4ab3e25"; + src = fetchFromGitHub { + owner = "jpt13653903"; + repo = "tree-sitter-vhdl"; + rev = "4ab3e251eae8890a020d083d00acd1b8c2653c07"; + hash = "sha256-egNgZ1GgRNvIdH08cf6V83bMeOECs23yiV5RzcXZENg="; + }; + meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; + }; vhs = buildGrammar { language = "vhs"; version = "0.0.0+rev=90028bb"; @@ -3005,12 +3069,12 @@ }; 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"; }; @@ -3025,6 +3089,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"; @@ -3071,12 +3146,12 @@ }; 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"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 24c6eb1bf0313..5d87976bd37fc 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -15,7 +15,9 @@ , python3 , rustPlatform , # Misc dependencies - Cocoa + arrow-cpp +, Cocoa +, coc-diagnostic , code-minimap , dasht , deno @@ -87,6 +89,7 @@ glib , gobject-introspection , wrapGAppsHook3 +, writeText , # sniprun dependencies bashInteractive , coreutils @@ -134,6 +137,10 @@ nvimRequireCheck = "alpha"; }; + advanced-git-search-nvim = super.autosave-nvim.overrideAttrs { + dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; + }; + autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; }; @@ -221,6 +228,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 ]; }; @@ -326,6 +337,11 @@ dependencies = with self; [ nvim-cmp zsh ]; }; + coc-diagnostic = buildVimPlugin { + inherit (coc-diagnostic) pname version meta; + src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; + }; + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; @@ -334,12 +350,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.8.80"; 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-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; + aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; + x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; + aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; }; codeium' = codeium.overrideAttrs rec { @@ -408,12 +424,12 @@ codesnap-nvim = let - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-KttvOfMieO+lBEgvkrBztWg7pUm/gFxYaTVXAQv15IM="; + hash = "sha256-3z0poNmS6LOS7/qGTBhvz1Q9WpYC7Wu4rNvHsUXB5ZY="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -421,7 +437,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-IZtWfyDZEaFSuj3uXBhBuGPi4IN1Dwt0ZkMSoxAum5c="; + cargoHash = "sha256-u0NvChN50LIxUhmsT4mvWs5xB/TwJkMabggFePA/b1E="; nativeBuildInputs = [ pkg-config @@ -540,6 +556,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.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 ]; @@ -608,7 +671,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 @@ -788,6 +851,8 @@ dependencies = with self; [ nvim-treesitter ]; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd @@ -869,7 +934,7 @@ inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -932,6 +997,8 @@ dependencies = with self; [ luaPackages.jsregexp ]; }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = "lz-n"; }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; @@ -1078,6 +1145,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 ]; }; @@ -1136,8 +1207,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 ]; @@ -1167,11 +1241,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 { @@ -1313,6 +1392,8 @@ dependencies = with self; [ nvim-lspconfig ]; }; + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = "rustaceanvim"; }; + sg-nvim = super.sg-nvim.overrideAttrs (old: let sg-nvim-rust = rustPlatform.buildRustPackage { @@ -1362,12 +1443,12 @@ sniprun = let - version = "1.3.14"; + version = "1.3.15"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-9vglmQ9sy0aCbj4H81ublHclpoSfOA7ss5CNdoX54sY="; + hash = "sha256-8N+KUawQ6RI6sG8m9wpvJTMQyJ5j/43PRkrTPrWAREQ="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1377,7 +1458,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-p4rZBgB3xQC14hRRTjNZT1G1gbaKydlKu6MYNSLk6iA="; + cargoHash = "sha256-bLki+6uMKJtk/bu+LNf2E1m/HpEG8zmnM3JI89IjmNs="; nativeBuildInputs = [ makeWrapper ]; @@ -1477,12 +1558,19 @@ 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"; @@ -1819,7 +1907,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; }; @@ -1990,6 +2078,10 @@ sourceRoot = "."; }; + yazi-nvim = super.yazi-nvim.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ @@ -2018,6 +2110,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 @@ -2035,7 +2128,6 @@ "coc-clangd" "coc-cmake" "coc-css" - "coc-diagnostic" "coc-docker" "coc-emmet" "coc-eslint" 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..00fb8b8dedc54 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}" ) wrapPythonPrograms ''; + shellHook = '' + export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts:$PYTHONPATH + ''; + meta.mainProgram = "vim-plugins-updater"; } diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4ace5711cd3d9..fc02ebb8d768c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -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 { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 52b49f86eee1c..4240139d51b24 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -43,6 +43,7 @@ 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/,, @@ -365,6 +366,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, @@ -384,7 +386,6 @@ 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/,, @@ -498,13 +499,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/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, +https://github.com/MeanderingProgrammer/markdown.nvim/,,render-markdown 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, @@ -514,6 +516,7 @@ 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, @@ -580,6 +583,7 @@ 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, @@ -779,6 +783,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, @@ -821,7 +826,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, @@ -974,6 +978,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/,, @@ -1446,9 +1451,11 @@ 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/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, @@ -1459,3 +1466,4 @@ https://github.com/ziglang/zig.vim/,, https://github.com/mickael-menu/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, +https://github.com/joerdav/templ.vim,HEAD, 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/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9a00fb31cd41e..7b2452a814bf8 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, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bf506f29f79e5..65b013afa9370 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"; @@ -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.4"; + hash = "sha256-mTmfIEXObDWi82z+59JaCjUDqFd9nOO/6QDtlHGuVvk="; }; 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; }; }; @@ -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.13.0"; + hash = "sha256-4gsblUMcN7a7UgoklBjc+2uiaSERq1vmi0exLht+Xi0="; }; 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,26 +1047,26 @@ 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 ]; @@ -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"; @@ -1279,8 +1267,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"; @@ -1637,8 +1625,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.22.0"; - hash = "sha256-pus5rOyVgheiblvWrkM3H/GZifBzUGR++JiHN4aU/3I="; + version = "0.23.0"; + hash = "sha256-eqS/xYK7yh7MvPAl61o1ZJ9wH9amqngJupU+puDq9xs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1807,6 +1795,23 @@ let }; }; + fill-labs.dependi = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dependi"; + publisher = "fill-labs"; + version = "0.7.5"; + hash = "sha256-troydfNj88c8A24ZtaCToE231VWzcCiQVLTSdVPM/XE="; + }; + 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"; @@ -2015,8 +2020,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 = { @@ -2032,8 +2037,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"; @@ -2064,8 +2069,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"; @@ -2129,8 +2134,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"; @@ -2169,7 +2174,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 = [ ]; }; }; @@ -2177,15 +2182,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 = [ ]; }; }; @@ -2779,8 +2784,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"; @@ -2987,10 +2992,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; }; }; @@ -3029,8 +3038,6 @@ let }; }; - mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; - mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; @@ -3078,7 +3085,7 @@ 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 = [ ]; }; }; @@ -3119,6 +3126,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.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"; @@ -3152,15 +3225,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 ]; }; }; @@ -3180,6 +3274,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 { @@ -3397,8 +3508,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"; @@ -3542,8 +3653,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"; @@ -3656,8 +3767,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"; @@ -4257,6 +4368,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"; @@ -4311,8 +4439,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.3"; - hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; + version = "4.0.5"; + hash = "sha256-vrM3a13S1LKQq2Bl/DN/vasVMyClBdYBOt8DiUbh61I="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -5181,8 +5309,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"; @@ -5353,6 +5481,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/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index c6124344a7da5..8d665025bba29 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-lpMwA5jMr10uV4uIjq9VNOKjqduxXuDZVIIszVIXSGw="; + 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-OaA3uNvKwbRGqMQqg6YozQF6AXxisO9ndDAFBj7wUEM="; + 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-o6B6eA4LqoLw1aGvUI95aK3pChyFXK3jUOH5Fpp4/IM="; + 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-cDv1l57C73UEtSJhTO+xb2sSX8xwepzJYxYuGsNq+r4="; + 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.7.27"; + version = "1.8.14"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. 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 2cbfa504f47a9..9c26f92ca9615 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-Y+Re3tDX8HQrWo045JxdX8Jt4jomm1/C9T+BU2/hE+g="; + hash = "sha256-uCayu7WU+qqiCDxxfO4j1aOypP+O49uNZMnfwq+hO4k="; binaries = linuxBins; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-nFCFK2GVLljMqmxJnlma6kAXHc9qN/DnnRiWrkjmLmo="; + hash = "sha256-b4Q3JWNdZtLlgxMUBpu+5ppJDILxjPHBZeMxsQHiDa0="; binaries = linuxBins; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-hC1ZJdBKJR3om9xuxEBhaBtQXEin1R0t7BFVdOUu6X8="; + hash = "sha256-uVI2PmHfhmuQMTCbwrGuLamC1DyjeLCZf41pjT891GE="; binaries = darwinBins; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-mIZJXgACvJmhrJzOtKcF2DKeBkLSjKehE1xEwtp1X+E="; + 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.34.12"; + version = "2.39.29"; inherit (extInfo) hash arch; }; 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..2c12d8fba1a12 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.7.1"; + hash = "sha256-hheuv4S399Kn/HNvaFZ8ynbR90eR4Z+NxNef0T9rGq0="; }; 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..b74faf6413c81 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.7.0"; + hash = "sha256-hf6Y1SjKfLGe5LQ9swbPzbOCtohQ43DzHXMZwRt2d90="; }; 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..55ed38a10130c 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-jibImnpRtshbHu21JeS4VxL1jETm3Ein8S/M73UXc2w="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-oVuDxx117bVd/jDqn9KivTwR5T2X5UZMHk/nZ/e/IOg="; + hash = "sha256-7UagRO7qHyT1JIvvTSx9+USYrnDRXJ2wnXPLaBHRc3k="; 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.21.4"; }; 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 35ed549fd4188..576aa80933ba6 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-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE="; + hash = "sha256-eM9FVeMPpNtd3ytTzrB8aVF+h25pUI+F5rXhv+vQmg0="; }; 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..a53fc7b8ca5b8 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 = @@ -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..5064922025247 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.19.0"; - hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; + version = "1.21.0"; + hash = "sha256-CnQiViKPmhnPFrhYC2sJV4Y0v4UyOD5kB0PXK7USfSY="; }; postPatch = '' 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..0d55381e6597a 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, diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5ed75a0ce32e1..7b320000d4dd1 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -206,6 +206,9 @@ in preFixup = '' gappsWrapperArgs+=( + ${ # we cannot use runtimeDependencies otherwise libdbusmenu do not work on kde + lib.optionalString stdenv.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}}" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ac4d1d69795bb..3116cdb598722 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.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 = "13572vj8izdkglrpk36z1nb3va3lbmsh885g1ix38x49hr3wjwaq"; + x86_64-darwin = "1xz0rhkpwiji60vy7klm424fdzs8393jggaswsbyapkj3g9nrkpb"; + aarch64-linux = "17rci7w2g595ziv1ylvzc5dhh0bc9l3a7mkl4lfljv6gaprdk766"; + aarch64-darwin = "1rxvlc36yrzdji0qdackp14a0xlhyj0iylxscz50gvnvfv2pdysm"; + armv7l-linux = "09iwsnr09cry9f6c4v7pkrdbcr8fnydjrmypjk5942dzz0b07lkr"; }.${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.92.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "5437499feb04f7a586f677b155b039bc2b3669eb"; + rev = "eaa41d57266683296de7d118f574d0c2652e1fc4"; 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 = "0g131nicp5j71phsfi187ggjx5952awvl0gy9983990sdxaah01x"; }; }; @@ -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..072c1a1ca5c53 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; - x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; - aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; - aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; - armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; + x86_64-linux = "0am2g0vpb2fgqqs9m5v9dx8w47l2xnjy7bf3rr0bjr4yv4qn7g0n"; + x86_64-darwin = "0520kpdfa2k1qlgnmnzisbbq0n4h119nfgnaljymsviw1ix02v7k"; + aarch64-linux = "0r6sqyfcj3qs2iqpfhdjcd8jfazkmyxx0f92qpxlc6a5gllm3hlj"; + aarch64-darwin = "03b0akbkmqp1fm6i61dx09lln8m3598xigi4wr0rkdsy0yq2vpl8"; + armv7l-linux = "1sdml7bhrrn2qskhzs4ymibq7cw4nhjimxi8fmaj94dk5yri4wd3"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2.24171"; + version = "1.91.1.24193"; pname = "vscodium"; executableName = "codium"; 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/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/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index aa4e5eef3c927..80f8374c378f6 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 = "1600"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-QmUquXoDGhoan+Y1kdkTirdkIvYPBkeAEkMLkaE9QKk="; + sha256 = "sha256-bSW0ZAPIBDh3+VhAJlp16W1z4fEIPUkI73grJE/KUx4="; }; installPhase = '' diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 0e543fa8d821f..00f7290a49ca6 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitHub, cmake, + extra-cmake-modules, pkg-config, makeWrapper, freetype, @@ -19,10 +20,13 @@ discord-gamesdk, libpcap, libslirp, + wayland, + wayland-scanner, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, enableVncRenderer ? false, + enableWayland ? stdenv.isLinux, unfreeEnableDiscord ? false, unfreeEnableRoms ? false, }: @@ -43,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper qt5.wrapQtAppsHook - ]; + ] ++ lib.optionals enableWayland [ extra-cmake-modules wayland-scanner ]; buildInputs = [ freetype @@ -58,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { libslirp qt5.qtbase qt5.qttools - ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableVncRenderer libvncserver; + ] ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional enableWayland wayland + ++ lib.optional enableVncRenderer libvncserver; cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" 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/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/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index a5fe1021e9171..3d396e07e3597 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -38,7 +38,7 @@ , xdg-user-dirs -, addOpenGLRunpath +, addDriverRunpath # Whether to pre-compile Python 2 bytecode for performance. , compilePy2Bytecode ? false @@ -217,7 +217,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/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 100ea1d3f9532..3ba6288a98878 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 @@ -56,23 +52,18 @@ , VideoToolbox }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "5.0-21460"; + version = "2407"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "a9544510468740b77cf06ef28daaa65fe247fd32"; - hash = "sha256-mhD7Uaqi8GzHdR7Y81TspvCnrZH2evWuWFgXMQ2c8g0="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; fetchSubmodules = true; }; - patches = [ - # TODO: Remove when merged https://github.com/dolphin-emu/dolphin/pull/12736 - ./find-minizip-ng.patch - ]; - strictDeps = true; nativeBuildInputs = [ @@ -133,8 +124,8 @@ 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 [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" @@ -165,20 +156,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,6 +169,6 @@ stdenv.mkDerivation rec { branch = "master"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + 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 95b06b9608572..6a2727478389e 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "shiiion"; repo = "dolphin"; rev = version; - sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; + hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; fetchSubmodules = true; }; 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 ff1773a837260..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 diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 4c545ac3b85ba..8b1e92b5963a5 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 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..e16bd97c2cd78 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.268"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-nggpDKcZURwC4SQHiRnF7lJNaAWSniVHvsF/IjAPd9E="; + hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index cc6992f7bcccb..c05b882b9634a 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; + hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 4ab69d9f08212..ab4ac151db71d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -15,10 +15,10 @@ "src": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "8bfa3b80f6a2db365dfd1e8a6c06b7b0844327cf", - "hash": "sha256-sUv1NT5aOwULOCC9vCrlRXcvVdlfZk9dmPMZg2NGAPg=" + "rev": "50141a6bf1a069abd86dd8c53aa4031f3f7cfbd1", + "hash": "sha256-pS5nvU+2eZ7We0ySN+Te6+Y3uuro5bz2FTPuLgvNCl4=" }, - "version": "unstable-2024-05-18" + "version": "unstable-2024-07-25" }, "beetle-gba": { "fetcher": "fetchFromGitHub", @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "3d91a940b3a48254152a8789b79616ceefe4067f", - "hash": "sha256-6zXl49Rns6wCZmcEUWkWqYeSH6W1+qs6Sb998pQ/+Lo=" + "rev": "03935421be14680a4aed799388e74ecab8167311", + "hash": "sha256-frZ+IYULs5QYGBSw8sp+kEM9U/ykEzZPM/XLdqPr7rs=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-07-26" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "9ebf08571e20e79db32be78a025a8b552e9a3795", - "hash": "sha256-iE81/8RMkCaJuFOMSfZzCC7BFOFBv/0cNpcJRuQC0ws=" + "rev": "7b7ad0760860f792f3f3a2768230397504e3f66d", + "hash": "sha256-KQLvjpUiA/p9wrUIrxd6jJddk91MEF7B58agPALmu/A=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-07-26" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "6f0ef7be0a023842b98ab5a8e7c7b5e4b2c31573", - "hash": "sha256-5jYDNuW0XjWTHTEEUkxK0DnQgvH2dZLUot/lmix05hk=" + "rev": "38d74b0b769e3a72e8ea574389b9cc80994e9cc8", + "hash": "sha256-1Lm7TYCTEx6hNa2tjSNWHJMh3vFhyR1oqwiuyVIu+XM=" }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-07-26" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "0e6ce96d68c1565d1cfb2d64841970f19f3cfb66", - "hash": "sha256-4LEvzyIpWBH0jfTuJaRxYe1fKdrw7/Mes6UlkxNyS58=" + "rev": "1943f676c70a9ceeee51f05a7422093c525e83ca", + "hash": "sha256-ANoD95tfBtJyOokB0fdBmFA+d+iJQ4EcFTZyBNXbfMY=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-07-26" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -155,20 +155,20 @@ "src": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "df29d437204af0a5158b6ecb2d6b68296f8d979a", - "hash": "sha256-ULDnLHbEQ1+VR3axfbVaH4Kkuq/UDBA9JGuW9beraZ4=" + "rev": "1f6b5b393df17e746bec118902b1d1f6ed3e4109", + "hash": "sha256-yndOlTf4OKUP98L1EN+LW4mwtl6LWQ95ILYo8Y+2Geg=" }, - "version": "unstable-2024-05-20" + "version": "unstable-2024-06-28" }, "bsnes": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "c5963607b59c8d56d28bb4de3f7ac555e004c69e", - "hash": "sha256-YmOy2iaQYqaIp4u4cIQx8Z8jUqaIhPdJZTFgSETQprs=" + "rev": "d63ec98054477d4be3398d108b6ec0a7b162349a", + "hash": "sha256-XONLqioPLJJkZMQ5e2wz0N2vMwZxsPG5FYkDeZgk+JU=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-07-26" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "00e3ed7e361afbab03363e493f5aa643e0bb2577", - "hash": "sha256-w57U5W4m8AZFujiY3L2uUFZQ7NsRzMU9NRPUerJk/9A=" + "rev": "2b7544492940e2208147f2b44cf6209b97ce8493", + "hash": "sha256-felA+nEqtbgW7BJ/kJPrfqGmLcMsv8jqN4nWA4uCvOE=" }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-08-01" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -287,31 +287,31 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "634d207adade213bbe83684be2a183d158f56e52", - "hash": "sha256-hmnb7euH2VfGnF8ztGFhXYmqaCY49APDG0Y3s4ku7Ac=" + "rev": "6fbc30a830c54304c16ba7dccd3aca2cb30bb473", + "hash": "sha256-zVrkyVskf3VIwEz50gG+z0Zp5SUeMEAX2ls9lKcyLXY=" }, - "version": "unstable-2024-06-02" + "version": "unstable-2024-07-27" }, "fceumm": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "9e685cda1372204048d831ef5976972dfb2dc541", - "hash": "sha256-O+FEHPuXybyMCMdvm9UdrZvl5K1yiFx2HIyhN3AuyVo=" + "rev": "744f5d9c8b976a431dcb5417a520c0c709b17fbe", + "hash": "sha256-ENkG4H2PiZFHRBbX5GRN/kCFTCZDzbJAV5CplThqaEE=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-07-20" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "7d645541f8f8b7f4550eabe9157d8fb82b43c1a7", - "hash": "sha256-/RLh6FO3lk6L1yhTMGLt7sjY/vwlb1y2XxmtgO5+uOk=", + "rev": "45bf218df428123f739714ef4e65e1b96c0959b7", + "hash": "sha256-TB8cSwvwyfG3tNsMf2qXDZGMTuwnNeRlhyH8fzDnvQM=", "fetchSubmodules": true }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-07-29" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -328,50 +328,50 @@ "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": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8", + "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI=" }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-06-28" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "5d47507d3e25354478b216111b30741868d0362b", - "hash": "sha256-PkvV3ALtC53v+Te9lGuUWeOfXr8CZSxCdClgS59vpns=" + "rev": "607c19668426b8945011fd11e25cfce7849f7e13", + "hash": "sha256-8uLKOxLRWbczUkhsXqjXVH7SDlIqrp0LNdzVjmxbP2U=" }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-07-26" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "5355eae2e1c70893a14ec0fda68de4e49cd5a0d5", - "hash": "sha256-134J1ifF9EOaPk6qqANdJawVtoa1M91Bc5jqxA0hMOM=" + "rev": "5567ea92c6a1b76d72fedaee679a997056038001", + "hash": "sha256-4NWA963BSJ9OTq8Lv1v8P3kYwY+mBTQ8uN6zspmkUB4=" }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-07-26" }, "gpsp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gpsp", - "rev": "bfbdfda215889cad5ae314bd5221d773a343b5bd", - "hash": "sha256-l3hr5c7kIgr7Rjfneai6cTpUswMpba51TlZSSreQkyE=" + "rev": "74c4b82cef7793b11892c791cc2379cb87847fb8", + "hash": "sha256-JvQ1zJoJg++yPEeXrxQGsoObht0vE3VXwf6ohLLuvw4=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-07-20" }, "gw": { "fetcher": "fetchFromGitHub", @@ -398,31 +398,31 @@ "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": "1e31f3a77644341e0ff9065aff3bc249fb024978", + "hash": "sha256-NqSPyyGRK1knL/RZ1Md8JjT3W6gRBpomgZiIH2Mp3co=", "fetchSubmodules": true }, - "version": "unstable-2024-06-13" + "version": "unstable-2024-07-07" }, "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", @@ -439,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "015fbd88bfd92c3847749fee01e8725f53c007ef", - "hash": "sha256-6wzi/r9bBKzxMmXQ4mHSzlnI5D9l87BuhHwM7HTvGr4=" + "rev": "8ffa3c773640956c02dfbcd7d5dc8e3a12fc6773", + "hash": "sha256-OzLXcXvrgNQa81n4z8MFEApqsYL4y1e9Cuela5kE34c=" }, - "version": "unstable-2024-06-30" + "version": "unstable-2024-07-28" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -529,21 +529,21 @@ "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": "147dc7e552b84d5c51d09108fa5ada0268710170", - "hash": "sha256-qsjoal3r/4QRJ0B5FcupZBhf9gyeIfok5cxsjeNJhrM=" + "rev": "c7cd8edcd015ddcbd4a2e984573c9c1d1ddd0b6e", + "hash": "sha256-QSGPfl29darzo5p8TiJbSMvezYkfRxon/XiObh5PULY=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-07-19" }, "neocd": { "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,10 +631,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "459f02ad03fa10b5c403fed724d47fe5adfd5fb1", - "hash": "sha256-bM2o6ukVXyrH9QnczHUtZCLu6Kwl6Gc9DriLvVHJmXw=" + "rev": "19f1a7d2de3a136810a84341db77d4f5eb8f3361", + "hash": "sha256-RnR6KuZa5cxw/Z+ZIZ2RhNrPRWlZupR9TDUhc2puBqQ=" }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-07-24" }, "picodrive": { "fetcher": "fetchFromGitHub", @@ -652,22 +652,22 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "a5753e582963e8555985abdfe6b5692bac52d701", - "hash": "sha256-OabW7OYitDzMh2bbAokfM+HwMaLo2cY3/FB78/ouvrY=", + "rev": "06517ef014305c8579f38fa7574ef3685181d037", + "hash": "sha256-b9lsxVRjkV85OzPE5569ZbeShji2kudbcz3amd9aXnA=", "fetchSubmodules": true }, - "version": "unstable-2024-06-10" + "version": "unstable-2024-07-29" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "c737eca1a7a0628523bcf710e2fa0a4288c31352", - "hash": "sha256-RSPyxhw27qL7FMgNqoGLGRiVue+BPB/huA2SvMMES+w=", + "rev": "52cf10274c342c1dd97d91c273b109d5c859d227", + "hash": "sha256-/XDrbaMyDJgyCZd/5vYkAXw7OvIXx+oagbwqL51uCFI=", "fetchSubmodules": true }, - "version": "unstable-2024-06-29" + "version": "unstable-2024-07-29" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -704,10 +704,10 @@ "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", @@ -744,30 +744,30 @@ "src": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", - "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=" + "rev": "29cd96822f5e9b71a8ccfa13a38c6c37ed83ccac", + "hash": "sha256-jdA5PDqwYCJ0V1MxTBJr2Lsm8r9jvZ+l2g2HgrhfP30=" }, - "version": "unstable-2023-10-31" + "version": "unstable-2024-07-22" }, "snes9x": { "fetcher": "fetchFromGitHub", "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "d514d135a7d3521e16e9ea599690e36e95c5c1aa", - "hash": "sha256-qk73jA8J6QD9Fp1tjqEf3eDLhJxp206gsku42ICjqPY=" + "rev": "e92b93ca9cd7936134abe0b90975bc9fc009fbf0", + "hash": "sha256-zsGf+3J0k7It/QEg/9SIZrb4yg8K8/6KXUE1/dK83yg=" }, - "version": "unstable-2024-06-18" + "version": "unstable-2024-07-29" }, "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", @@ -784,20 +784,20 @@ "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": "69b300b6f9d46c4f9caa2df1f848a74163cd1173", - "hash": "sha256-8TgbZzmuwDUn23zR1/XKIOdrLwgzq18oMS1KOhSs1oQ=" + "rev": "56e6bd69bc070f1d31e13610f1a7ebb1ca8bacbf", + "hash": "sha256-M2pyCeBQ3N51E6Xy+NvnQwAcuAuXL8sRvZm3nuyeFv0=" }, - "version": "unstable-2024-06-30" + "version": "unstable-2024-07-30" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -814,20 +814,20 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "8a999111ff3b8e40dd093c214dd56ba1596e1115", - "hash": "sha256-H9NWRbtqc+Zx/cBtS6LAbL6DsTLeDGGXhRRBD5W5tHg=" + "rev": "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb", + "hash": "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E=" }, - "version": "unstable-2024-06-29" + "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", diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix index 57748a04dada7..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; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "SimpleNES"; }; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index dfc72683d7d3b..54fea4cc901ea 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -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/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 8082194500cc8..2448d5048f18b 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.12"; + version = "9.14"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY="; + hash = "sha256-JFcvSc80c/ye8qGtHN31Ec4O9D2qVUE7RyCmw+PInqY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw="; + hash = "sha256-IvT56lWULfA5MFLEjnpnNX4OhjQwR6XqBGJ3i4nqJrk="; 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..4a9bfb6c3204e 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 {}; @@ -9,7 +9,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino (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; + nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs; prePatch = self.prePatch or "" + '' patchShebangs tools 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..92895378c355e 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ 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/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/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/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 7b5c4340edd66..0b09d6ea9ed58 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -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/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 4eb10a34d2e24..fd26e49fdbd88 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,17 +5,22 @@ , makeWrapper , wrapGAppsHook3 +, withOpenGL ? true + , bison , blas , cairo , ffmpeg , fftw , flex +, freetype , gdal , geos +, lapack +, libGLU , libiconv -, libmysqlclient , libpng +, libsvm , libtiff , libxml2 , netcdf @@ -23,7 +28,7 @@ , pkg-config , postgresql , proj -, python3Packages +, python311Packages , readline , sqlite , wxGTK32 @@ -31,15 +36,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 +59,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,7 +85,8 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals withOpenGL [ libGLU ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; strictDeps = true; @@ -84,26 +95,30 @@ stdenv.mkDerivation (finalAttrs: { ./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 [ "--without-cairo" @@ -127,7 +142,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..e5e744b374678 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44d..bcf99a5f4e4f3 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin 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/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 3515294150255..5e55f8c75e3ed 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.8"; + version = "3.34.9"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-UeyGx+C7szXv++hXFV006Xk4oSKfSj4teJIwaD4ODVk="; + hash = "sha256-4ZgCvg3VSa1LJQ8yr45nY4ZI7tyVVdW7WPK/jwBI+HU="; }; 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}"; }) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 3efce9160d051..4ac26a0c804bd 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.38.0"; + version = "3.38.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vL9Go8Kn6VFOeztD/LZi5QHpZVPFfOFarTsCLTf4D2s="; + hash = "sha256-8fwLn77CK8w4srJNUilfJumDt2wCcQLs9D5/4tzpzPA="; }; passthru = { 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/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..dac185e3d3d07 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 @@ -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..1a45480cb3eeb 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-36"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU="; + hash = "sha256-Y/tj8IAhsCFK7Yd0MXZ8X6AOLxICyVOIaSaQveMf17k="; }; 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 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/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index eac82182f61dc..37543db1babd2 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , mkDerivation , fetchFromGitHub , makeDesktopItem @@ -25,13 +24,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; }; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 208c0ea821cd1..d8e8693166194 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -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..6c6c6de1d8523 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 = [ ]; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 561a365b56210..4d4f004976867 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -53,15 +53,17 @@ , libaom , portmidi , lua +, dav1d +, libyuv }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.8.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-QZhJ6QFScOQHXyNBxrVTLT0czMz6jxlZLLLqOtF/klU="; + sha256 = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE="; }; nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; @@ -106,6 +108,8 @@ stdenv.mkDerivation rec { libaom portmidi lua + dav1d + libyuv ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk @@ -145,6 +149,6 @@ stdenv.mkDerivation rec { homepage = "https://www.darktable.org"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits freyacodes ]; + maintainers = with maintainers; [ flosse mrVanDalo paperdigits freyacodes ]; }; } diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index dee31abdd29d2..ca93a5f579c9c 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,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU="; }; - cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; + cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index dc3b9e4b3a61b..5daaf0e10ef1e 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 +, opencascade-occt +, assimp +, fontconfig , withManual ? !stdenv.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,6 +45,9 @@ stdenv.mkDerivation rec { buildInputs = [ vtk_9 + opencascade-occt + assimp + fontconfig ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL @@ -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 bc27d93db6670..56f4936ceff1d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -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/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/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/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/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe4904ee254a4..667a1d505751a 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 = [ ]; }; }; diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 1a091929b3e49..6d0a8a8436f37 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.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 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/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 89b86bf24b206..b3556cf27846c 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "gqview"; }; } diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index f0869bca596df..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.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io="; + 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 7de0541955206..5b56ce7585614 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -22,7 +22,6 @@ , libwebp , libX11 , json-glib -, webkitgtk , lcms2 , bison , flex @@ -32,6 +31,7 @@ , python3 , desktop-file-utils , itstool +, withWebservices ? true, webkitgtk }: stdenv.mkDerivation rec { @@ -79,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/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 03d7be3dfad1e..51a11528cb8fa 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 = "581"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-u2SXhL57iNVjRFqerzc/TByB9ArAJx81mxOjTBVBMkg="; + hash = "sha256-Q/EdqwIMCjeDtFAPlYd04NMpEgC6xUDGK5LwxDCiI9Y="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ python3Packages.buildPythonPackage rec { lz4 numpy opencv4 + olefile pillow pillow-heif psutil @@ -74,6 +76,7 @@ python3Packages.buildPythonPackage rec { pyyaml qtpy requests + show-in-file-manager send2trash service-identity twisted diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 2f4aae6dc2619..8b2347f438184 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.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 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/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c285fc3116401..81cd91ebb6b0b 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 = '' 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/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 9b6e71057aa27..8946d7e4afc98 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.49.0"; + version = "1.52.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-AMlhhsbwLhofV/Sy/EXuE4l0UAwZf2Gxn9+x3MHno4Y="; + hash = "sha256-Ls8haijbd5rPQwnJCYjLbA1KAVZhPk0aRRe2TtzmTCs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 1f6a9460a6a48..308538f5d691d 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 = [ ]; mainProgram = "lazpaint"; }; } diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 78b6f2d3f5683..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.03"; + 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-yMxCe9Bu5llAUrTLG8R+1HX65rs9fhhoVG79vxDzeWY="; + sha256 = "sha256-3dvLUfOczysRC8Ou6aQHzzmJs2rwtKAvfrwpQ4VMB/M="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 800ede30be429..8d965fe7b1298 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; }; - cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; + cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; 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/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/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 9eacdc642ce56..363114fdaafbd 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 @@ -34,6 +34,22 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; }; + 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' \ @@ -52,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { fontconfig openssl poppler - ffmpeg + ffmpeg_7 libva alsa-lib SDL 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..3af9566c375fa 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 = [ diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 365996aaf5917..c7e7b7d07f5e7 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + perl ]; buildInputs = [ libjpeg libpng libtiff - perl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; 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/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/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/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/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..c2561ed82ae51 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; }; - cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; + cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index c15599ec66bbb..9749ae5b658fd 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,4 +1,4 @@ -{ 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; '' patchelf --set-interpreter \ diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 3038d2be21232..1581b2f5b7b24 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 ]; @@ -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/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/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/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index c20f10ee0d1bd..3c83be5119764 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 @@ -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.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 @@ -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..16899aea978b9 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -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 76c8b7f692af9..6ab953020c607 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; + hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; }; nativeBuildInputs = [ cmake wrapGAppsHook3 ]; @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 - maintainers = with maintainers; [ ]; + 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/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 21a0389949046..41c51787d7e43 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 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/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..3527f96bf5b9e 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 @@ -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/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/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/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 b6dbe3d99d8d7..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 @@ -81,25 +82,26 @@ mkDerivation { kpurpose kdeclarative wrapGAppsHook3 - glaxnimate ]; + # 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 ./dependency-paths-glaxnimate.patch ]; - - # Needed to replace @glaxnimate@ by its path - env = { - inherit mediainfo glaxnimate; - 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-glaxnimate.patch b/pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch deleted file mode 100644 index 17d7ddfcee963..0000000000000 --- a/pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 86fa5ef..6aeccbe 100644 ---- a/src/kdenlivesettings.kcfg -+++ b/src/kdenlivesettings.kcfg -@@ -657,7 +657,7 @@ - - <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"> \ No newline at end of file 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/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/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/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/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/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..6a5e3f8781fa3 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -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..9d9a9fd4eb603 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.36" else "8.10.38-13.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-yUSU0np6li5zLfFOnebpv0+s1UQ6BdgI+28OvcxS3H8="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-g4RMTlBQvJQaPD/6scYjpe7NWrL6gkjvh5b9LubTWaE="; + hash = "sha256-KG0PJ/gwBd9+qYyraRqS/D58Y58VwLd8yCnYzPVWQAY="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-YzAYMk3SR+paIQYAZCx840u/k77soy17F15owpqRAU0="; + hash = "sha256-vYhmA9N1izPRo3HPDouOpjJzMwK7LkCHuyYxBGkIPKM="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-FlJnPMIv7mWh3dSACq01f16mB9EkVD2LOg3IIpvjwdY="; + hash = "sha256-v1eCh/cOpA5XcmamAqreKHRQ+waoBQtvvmNO4wvFq6A="; }; }; 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-SeB1Em2WuYvslBv//TROYTAB1asYFhC22IwhcwGi+Qs="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-dajdeU8TtD9Dbnp2MFedAl8tuQr275cUqGAnm/VF+OE="; + hash = "sha256-Ik5gL5FCxNANOKx/MSH7dCz3XEdLr7jxykaWhMQKUVw="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-Dm8v7B8qDSBe1i7OJKQFn7YDPkw3Qj8YVtQkaQmdKuc="; + hash = "sha256-8cNxhRAOrn/A++APOMUxwrD3+a++ksRMzlmmnQ8J8/c="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-QSxJoVPlOQU7hbvbuVcB/kf5umRjJQuygMkXq6lE1CQ="; + hash = "sha256-YkZbuCFvWHksLQYKJ3LQD2YDXj9qwHF4Gg8JbxBZsuc="; }; }; }; 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.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.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/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index ce23bd8ee3f18..bc2b92843c36f 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.4.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; + hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 79ed6cdf624a5..170e10fbeb01a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -2,153 +2,147 @@ # 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 = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; }) + (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 = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; }) + (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.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 = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; }) + (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.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; }) + (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.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; }) + (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.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; }) + (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-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; }) + (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..b1da7708bfe96 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 = "3ae4df4206a3f5fbbe582403403df848fd29847f"; 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-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s="; }; - npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; + npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4="; 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 index 0c4193aa2e5dd..ba33c8baa85b2 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; + hash = "sha256-eowsQhaS9RGfsw157HahENuWUWtwkwyPNSFw135MW0c="; fetchSubmodules = true; }; @@ -58,10 +58,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - # WARN: This is necessary for albert to detect the package libraries. - # Please check if the file below has changed upstream before updating. - sed -i src/app/qtpluginprovider.cpp \ - -e "/QStringList install_paths;/a install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" + substituteInPlace src/app/qtpluginprovider.cpp \ + --replace-fail "QStringList install_paths;" "QStringList install_paths;${"\n"}install_paths << QFileInfo(\"$out/lib\").canonicalFilePath();" ''; postFixup = '' @@ -74,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Fast and flexible keyboard launcher"; longDescription = '' Albert is a desktop agnostic launcher. Its goals are usability and beauty, @@ -84,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { 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; [ + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ ericsagnes synthetica eljamm ]; mainProgram = "albert"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) 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/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..b621635444266 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.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-YRRm8/yDwQIUjzqYzlqij8h2ri39Q7L8jVh5fgrZbGs="; + hash = "sha256-YOsKAWc6z39OPzc4eWc/9RhRoOD+J5xHve4Low1UX+Q="; }; 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/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 2c2c00d8b24ab..a72e2a390e1a9 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -72,14 +72,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.44.1"; + version = "1.48.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="; + sha256 = "sha256-JDNdMy0Wk6v2pMKS+NzSbsrffaEG2IneZO+K9pBFX48="; }; nativeBuildInputs = [ @@ -122,7 +122,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/4.11.1.1"; rpath = lib.concatStringsSep ":" [ (lib.makeLibraryPath [ 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 02d15b5068722..0000000000000 --- a/pkgs/applications/misc/bazecor/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, - makeWrapper, -}: -let - 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-fail \ - 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ - 'checkUdev=()=>{return 1}' - ''; - }; -in -appimageTools.wrapAppImage { - inherit pname version src; - - # also make sure to update the udev rules in ./10-dygma.rules; most recently - # taken from - # 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 = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/bazecor \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps - - mkdir -p $out/lib/udev/rules.d - install -m 444 -D ${./10-dygma.rules} $out/lib/udev/rules.d/10-dygma.rules - - substituteInPlace $out/share/applications/Bazecor.desktop \ - --replace-fail 'Exec=Bazecor' 'Exec=bazecor' - ''; - - meta = { - 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 - gcleroux - ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "bazecor"; - }; -} diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 021b793015fff..1ddf73deb98fd 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,13 +7,13 @@ 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; 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/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3d044abaad6d9..d400dd1eba55e 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,7 +68,7 @@ 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, @@ -86,7 +83,6 @@ }: let - python3Packages = python311Packages; python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -104,35 +100,46 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.1.1"; + version = "4.2.0"; - 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-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY="; + }) + (fetchgit { + name = "assets"; + url = "https://projects.blender.org/blender/blender-assets.git"; + rev = "6864f1832e71a31e1e04f72bb7a5a1f53f0cd01c"; + 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; 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.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"' @@ -154,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" - "-DMaterialX_DIR=${materialx}/lib/cmake/MaterialX" + "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" @@ -177,7 +184,9 @@ 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.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + "-DWITH_CYCLES_EMBREE=OFF" + ] ++ lib.optionals stdenv.isDarwin [ "-DLIBDIR=/does-not-exist" "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin @@ -192,6 +201,17 @@ stdenv.mkDerivation (finalAttrs: { "-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,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.wrapPython ] ++ lib.optionals cudaSupport [ - addOpenGLRunpath + addDriverRunpath cudaPackages.cuda_nvcc ] ++ lib.optionals waylandSupport [ pkg-config ]; @@ -225,7 +245,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libtiff libwebp - materialx opencolorio openexr openimageio @@ -236,6 +255,7 @@ stdenv.mkDerivation (finalAttrs: { potrace pugixml python3 + python3Packages.materialx tbb zlib zstd @@ -291,7 +311,7 @@ stdenv.mkDerivation (finalAttrs: { ps = python3Packages; in [ - materialx + ps.materialx ps.numpy ps.requests ps.zstandard @@ -320,15 +340,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.isDarwin '' + makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender + ''; passthru = { python = python3; @@ -342,10 +363,8 @@ 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 @@ -359,7 +378,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 +415,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" @@ -406,10 +427,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # 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"; - maintainers = with lib.maintainers; [ - goibhniu - veprbl - ]; + maintainers = with lib.maintainers; [ 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/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e1bf6cffb008d..61a0b3b3e81a8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,7 +21,7 @@ , qmake , qtbase , qtwayland -, speechd +, speechd-minimal , sqlite , wrapQtAppsHook , xdg-utils @@ -33,11 +33,11 @@ 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 = [ @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (unrarSupport) unrardll) ) xdg-utils - ] ++ lib.optional (speechSupport) speechd; + ] ++ lib.optional (speechSupport) speechd-minimal; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 0b7630b53f099..833ad9202b9fd 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"; 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..a8d252adfb7de 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; + hash = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; }; doCheck = false; # there are no tests 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..ae3964355a48c 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="; }; 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/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 1fda517675416..82276b73c4d14 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ 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 ]; diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 0aca420fc7a45..e20bf9b818adc 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -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/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/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/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 9240635aa5421..efcedf63d2a13 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , extra-cmake-modules -, botan2 +, botan3 , karchive , kauth , libdrm @@ -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,7 +42,7 @@ stdenv.mkDerivation rec{ wrapQtAppsHook ]; buildInputs = [ - botan2 + botan3 karchive kauth libdrm diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 14c8ee0edd4e2..a6ab6223f3141 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-6FriNAwxo+YnJWmCrScyafUEkJvEJz3O9Zoj9yerpSI="; + hash = "sha256-ey5JIlvCGmkXDGP0jol5cy/eC7grTmgNoqWecyY8DDk="; }; - cargoHash = "sha256-/CW0CGhPjKd5oU2LYW4lPWKMATn9aJdjIy44yZJyU/E="; + cargoHash = "sha256-O7GqYPwbVrvU0wElUtkVVeX+4QKb6zg9Gfw+tZ78SDw="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 35d2ab7117947..0d29b7921a66d 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; }; 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 a9d7d2730a72c..26ea5f2cad0bf 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dasel"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-j9gwE/iLbBM8sdNZgc7hYnKhJEMkLn/g9HVlsKn4moo="; + hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I="; }; vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4="; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 9dc19941a0720..294bc33a0ba7e 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,8 +50,7 @@ python.pkgs.buildPythonApplication rec { tenacity typer watchdog - ] - ++ typer.optional-dependencies.all; + ]; passthru.optional-dependencies = with python3.pkgs; { aws = [ boto3 ]; 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..502c247ce2d21 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 = [ 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/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/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix index 487d8340265de..6b54636488e9b 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/applications/misc/doctave/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { # Cargo.lock is outdated cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; + cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices 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/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/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 96afa4d39a1b1..859d7bb42b00e 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,6 @@ python.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 4ca911126c5ba..9d71a5886be63 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -54,7 +54,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ef52f6211fdaa..d74f706cbf924 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -70,7 +70,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi # plugins btchip-python diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index 45e36010906b6..f8f24fa63569a 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; }; - cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; + cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index deeaca6b86be1..7f23c92619703 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.0" 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..ac828dc87cc59 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.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-gHlm5ZQ5u+gOSBERlg6iYJxGTfs/+L4y2TY+ZOsVYh8="; + hash = "sha256-V8fz65LNNCEhexV+ps3cclc0CJljVlAwBf2KjZCBx88="; }; + 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 = { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 656db72846300..f35df6a049f21 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 ]; 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..8eb001e9c93bb 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,7 +95,7 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString withCuda '' - addOpenGLRunpath $out/bin/FIRESTARTER_CUDA + addDriverRunpath $out/bin/FIRESTARTER_CUDA ''; meta = with lib; { diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ffb329129d8e8..98146e6bfdf38 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { 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/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index afe2f188363e7..0dc44c4eb6474 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -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 022416c37611f..158397ac54d9c 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.1"; + version = "1.27.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8="; + hash = "sha256-CTc6CBAFIxOX5Bd/hy3e65MbWyI2wFn+a6hj4ktuBjo="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index a6b98ccccf08e..8f345f39b534a 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -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/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/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/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..5743054d4f80a 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 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..344f3439ef808 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 @@ -61,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: { libiconv opencc libeb - ffmpeg xapian libzim ]; @@ -76,7 +74,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/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/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index eaf0fc44d29dd..97d6b674d5e57 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }: +{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }: stdenv.mkDerivation { pname = "gpu-burn"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ cudatoolkit ]; - nativeBuildInputs = [ addOpenGLRunpath ]; + nativeBuildInputs = [ addDriverRunpath ]; makeFlags = [ "CUDAPATH=${cudatoolkit}" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; postFixup = '' - addOpenGLRunpath $out/bin/gpu_burn + addDriverRunpath $out/bin/gpu_burn ''; meta = with lib; { diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 0501d9f707e69..43e1b73cf87a3 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.22"; + version = "13.23"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; + hash = "sha256-GC1Csxhr2uh9oLgC+mFxJZiwCO7TMI2ljv6GMdEiuZQ="; }; buildInputs = [ 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/gum/default.nix b/pkgs/applications/misc/gum/default.nix index d4a67e5f8a87d..f8f5d6778b213 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-rQSSbDHMSWJDSxn/SNNMaOrdZJUhQPnZutmpY9828t0="; + hash = "sha256-cSPzbPGUwgvaFJ4qp9Dmm+hwORI5ndFqXjuAjjPwFeQ="; }; - vendorHash = "sha256-pkQ8UvWLIWH8gXux/dd0HLdiz7RDrmFJ8SX63Q+nNyw="; + vendorHash = "sha256-1M+qg20OMeOzxwTkYVROYAhK6lHhXoZ5bAnU2PNaYPQ="; nativeBuildInputs = [ installShellFiles 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/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..ed8f44f45266c 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.278"; eulaDate = "2021-10-13"; - src = requireFile rec { + src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6"; + hash = "sha256-O5oAoiDiu+xrmDfTnilPqZue8+dXVTHnK0yrX6moTSc="; 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..d4c199d48939a 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/7473-standard-linux-1-6-24-release"; + version = "1.6.24-094b0af9"; + sha256 = "sha256:1jwyl51lljxn6hnkp07bvgw60bqmq3gb0rdgvxmd7r8x3y3xshx1"; 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/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..4f9c748730e59 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; }; - cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; + cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index a37f965dd5306..f896b45187906 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec { "--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 '' 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/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/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 219f15936fb9b..2118d623cd226 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.13"; 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-/B7udtkRP8rOYzXupWSEGg0FrJoRJ63l4uLtQWe2CZ8="; + x86_64-darwin = "sha256-XZN1jTv/FhJXuFxZ6D6h/vFMdKi84Z9UWfj2CrMgBBA="; + aarch64-darwin = "sha256-lsODOBkZ4+x5D6Er2/paTzAMKZvqIBVkKrWHh5iRvrk="; }.${system} or throwSystem; }; @@ -39,7 +39,7 @@ 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 { @@ -64,7 +64,7 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "Joplin.app"; 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/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index ec633ac7514b9..663768e28dae8 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 @@ -114,7 +115,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl - botan2 + botan3 + kio libXi libXtst libargon2 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/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/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/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..02911f312122a 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}/libexec/electron" + "-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/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 0784ff3ddc941..9bc7c7cbe34a1 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; + hash = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; }; cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs="; @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { sqlite ] ++ lib.optionals stdenv.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/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/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/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 573d0311887a6..dda7343d25e15 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.4"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-rRE7VE6Fugqbbv/fTIZGuWDQmTP1tRDiKrb6VcpsBjk="; + sha256 = "sha256-U+yelFSulAhgsn5xt45mxC7qGpQwmb3m3lt9nEW6MHU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 299ac3a9e2d4e..7a85860cac0de 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -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 c1beb102cdd65..0f2f1e9c08602 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -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..3407af8df3d76 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -73,6 +73,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/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/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/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/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 755cb735e737e..b91ab51fff511 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = "mob"; rev = "v${version}"; - hash = "sha256-+pN+FGZCW5sPWpUNIYTFn26KBpHre+9PPBQwEcBNJWI="; + hash = "sha256-CUD4gcQrLzYsD6zX6I4C59lHGKOaE5ggjbIVyznBNEg="; }; vendorHash = null; 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/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix index b8cb75b057fd1..932e23682f71d 100644 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ b/pkgs/applications/misc/mupdf/1.17/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, libGLU +, enableGL ? true, libglut, libGLU }: let @@ -33,14 +33,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut 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 ]) + [ libglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; knownVulnerabilities = [ "CVE-2020-26519: denial of service when parsing JBIG2" diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9422b6452cec2..0f2ec9f39f23e 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index caecc46d5432c..5591fa9b4533b 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,10 +138,6 @@ 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" 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/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..cccb55f5e5f72 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -40,6 +40,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/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index ebac30c58a6cf..82ade89882a1b 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.11"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,7 +16,7 @@ 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-linux = "sha256-QnjfeN6CoLiyZvJY4mAZFJ58LxHhe/QUzpI4Fbz5Etg="; x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q="; aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0="; }.${system} or throwSystem; 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/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 9ca05a653a358..41ddd2cf8d943 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -11,14 +11,14 @@ , commandLineArgs ? "" }: let - inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.5"; + 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 ]; }; @@ -26,7 +26,7 @@ let filename = if stdenv.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-gA6FkCalGw0pgnCbOJliItLzMGr+CG9r6mSMdvVUAoQ=" else "sha256-9goJnKOgJk5TrFUNz4vff8704cvHfqZpGL/iBkcU2GY="; + hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 83dc79a0598ac..18369b8827b5b 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.2"; + 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-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; - }; + (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.isDarwin [ py.pkgs.appdirs ] + ++ lib.optionals (!stdenv.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.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/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 2d28d8138c289..8d4d4df4ef755 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { broken = stdenv.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..d6c7da1ffefbd 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -157,8 +157,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/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84aff125aac2b..380a88e6f2e0e 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 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/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index d21e306c8a7a6..b3cbfce55e221 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.06.19-3"; + version = "2024.07.29-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-LB3yLBoO6nXRvfuWWB2JofeAgQQFtEgqNo2QFQ3k/vc="; + hash = "sha256-cAoG/4vuA664+JcLTUdlLMMRggAznqHh3NA0Pk8RcFc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 8ca73be27547c..0befa164fa3fa 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.7.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xw6Z/xDPQEVMdxMzrhtPAl3nOD7oMlZhKDb9bD8GEO8="; + hash = "sha256-Ah1TWRxLFKgSDjnLO5XLIyo1hgD7EAlMHDbxxcOu4Yg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index bfa2278e8b866..43bf5af6267cf 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.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dBehxqr/UCXIQDMrGFN6ID+v0NYi50JTHuML3su2O0A="; + hash = "sha256-bn+5LBqZNwrhVX0KfXNBS00rE+BybN/NJmL4lu/oua0="; }; - cargoHash = "sha256-wI7yqRvaszBP4OtlWbWIZ9RLf5y7dx2KufYLaK+PWps="; + cargoHash = "sha256-ssjLfNPP8g+2IOv0AQb+Soe/0e1H2LoqFSpmljj/z3o="; 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..1ab2edea76625 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.10"; + version = "4.0"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-IDOtwrIKzP/pbwqIespvZtNS1VdR3246uXxgxR3V6VI="; + hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; fetchSubmodules = true; }; @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DWITH_LTO=OFF"]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.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..7ee28983d2f51 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,7 +7,6 @@ , gzip , nodejs , rustc -, stdenv , wasm-bindgen-cli , wasm-pack }: @@ -121,9 +119,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 436822aa2b889..3bd2734597a35 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -16,7 +16,7 @@ , libXfixes , libpulseaudio , libva -, ffmpeg_5 +, ffmpeg_4 , libpng , libjpeg8 , curl @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation { alsa-lib libpulseaudio libva - ffmpeg_5 + ffmpeg_4 libpng libjpeg8 curl diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 69e6a53758a4f..f77bf332b57d9 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc="; }; - cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; + cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix deleted file mode 100644 index 5dda053eb7530..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.11.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "pdfarranger"; - repo = "pdfarranger"; - rev = "refs/tags/${version}"; - hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; - }; - - 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/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 9a71d8add70e1..3e55a0de0a934 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; + hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; fetchSubmodules = true; }; 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/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index 35244bf041a77..77774b5343a55 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; }; - cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; meta = with lib; { diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix index b8ba5133904b2..b8e614485a291 100644 --- a/pkgs/applications/misc/pop-launcher/default.nix +++ b/pkgs/applications/misc/pop-launcher/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { --replace '/usr/bin/gnome-terminal' 'gnome-terminal' ''; - cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; + cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index dad288ef47595..a8889ae88115c 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.9.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-yFKqdUlfiMQbx3yJLD5/BJ8pecg5NRr64+HbUwsEOE4="; + hash = "sha256-vZYPbvMt0z08KoN75w3v9Vu0NcpcSz8WpX1CJeO1YbU="; # 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-9tSNqdngkx2Tbb5m6UByu8Q+UYeWnwdGmm5De6ITw3k="; doCheck = false; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 94327ef3e4db9..ef2b9fec3adba 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -13,10 +13,10 @@ 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 ]; 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..a9d78e9884e11 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -128,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: { # prusa-slicer uses dlopen on `libudev.so` at runtime NIX_LDFLAGS = lib.optionalString withSystemd "-ludev"; + # FIXME: remove in 2.8.0 + NIX_CFLAGS_COMPILE = "-Wno-enum-constexpr-conversion"; + prePatch = '' # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx # now seems to be integrated into the main lib. 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/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index 0242164be79c1..04dcf343e5416 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -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 f752052da2c86..dc2de8b0cd730 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 ]; 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 296a81e075da3..d2340b15f1b71 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -18,6 +18,7 @@ let python = python310.override { + self = python; packageOverrides = (self: super: { matplotlib = super.matplotlib.override { enableGtk3 = true; @@ -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..a28e8d588693d 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -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 d4b014ea85ae0..b94b8326dca3b 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.1.1"; + version = "3.30.1.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-hZe1rTRkvdKC/row0Li6hsmOcLKkMULo9ScOvvjmWCA="; + hash = "sha256-bGSXFX1LuNZzs981t0GZxnMPzyJ+bddB4m/wkLMsfg0="; }; patches = [ 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..b737716ed5d38 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp"; + cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index f0c46f8c207a8..4546883b2bb33 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -120,7 +120,7 @@ rec { homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; mainProgram = "redshift"; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; }; }; @@ -132,7 +132,7 @@ rec { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { 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/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index fa99e88f87a67..9c951a6433ce3 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -1,23 +1,24 @@ { lib , stdenv +, callPackage , fetchFromSourcehut , pkg-config , river , wayland , wayland-protocols -, zig_0_11 +, 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 +26,13 @@ stdenv.mkDerivation (finalAttrs: { river wayland wayland-protocols - zig_0_11.hook + 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 +49,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..ecf0db9db9b00 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , rofi-unwrapped , wayland-scanner @@ -16,7 +15,7 @@ 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 ]; 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/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/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..47ff2d588b718 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -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/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/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/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/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 353712d5ba896..11f49d8506b5e 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 = [ 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/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/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..0de395549bddd 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 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/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/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b66c4f74d724e..2c69b1343e9df 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.4"; + version = "1.6.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-3Z9heiQiuYzWtReKs/XeA+ENRKgxHR74ANzrDcdyjh4="; + hash = "sha256-tbtSISWBNHxuF2T1XK5JnkiPMYzgP4fyw5t6z91P2p8="; }; buildInputs = [ diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 6b0d3e95721b1..fe15ce3b98b0c 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; }; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 096f0589baedf..05ecbe0b795de 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 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/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index b2bda05d54964..489c1fefc7e77 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="; + }; + }); }; }; 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 index 105d470d13580..0becdf5114581 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "taskwarrior"; rev = "v${version}"; - sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; + hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; fetchSubmodules = true; }; 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/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/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/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/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/translatelocally/default.nix b/pkgs/applications/misc/translatelocally/default.nix index c4fd6378ccefe..2749a7ec1566d 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; }; @@ -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..af81be60709d1 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.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-5v3Eu85x3xNvTRgfxhlDz4hiJ4UO010pZPY7UPHk7mQ="; + sha256 = "sha256-PZ1q360gkV+mB0pgkrUmViZqJRyrX8NkmFFZhqvFIPk="; }; - cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ="; + cargoHash = "sha256-9LoVtY9Okt2SUQLDMgM6V76OJBM4WU0sQioXHlNNzwU="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index a3033bcd07dbb..a84da1c0381f2 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.2"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64="; + hash = "sha256-nBNb2Hqv2AumwYoQnYZnH6YGp9wGr1o9vRO8YOty214="; }; 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..46dcf25f08e94 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.0"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; + hash = "sha256-cIyqka/+CrO9RuKr7tI79QvpPA0mDL/YzWWWrcwin8E="; }; - cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; + cargoHash = "sha256-5Z7UpkLlNMW8prtdJO+Xr45fpacjhDBoD/RFv/H44t0="; 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..d861601364e13 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.9.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-FAN0F54cCEfqoSr1La+X+et5MGTzB2Wb466Xr8eyeiI="; + hash = "sha256-GmLhBlNHVyO0oUvjOBpTEqQiPYZ68MdgwAqt9v2oMdU="; }; - cargoHash = "sha256-y6gAv4Xf0yxpbOAdYhp3nDBH8skiyAI10+Ylz/uxf7w="; + cargoHash = "sha256-+5rWjq3/0xfJ5Nbq0kReombuaJkcFmHoqVzzQ4x68Hc="; nativeBuildInputs = [ pkg-config 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/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/udict/default.nix b/pkgs/applications/misc/udict/default.nix index 62d698cc3a360..24424c1017db7 100644 --- a/pkgs/applications/misc/udict/default.nix +++ b/pkgs/applications/misc/udict/default.nix @@ -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 index 7df3f1d23b9cc..58fa8054c67d7 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -7,16 +7,16 @@ , libappindicator-gtk3 , libnotify , librsvg -, python3 +, python3Packages , udisks2 , wrapGAppsHook3 , testers , udiskie }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "udiskie"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-r9ppuWYY3e2thsfFh4ooOgfqNvmCVw7fS0SpJCJcysQ="; + hash = "sha256-asrVQR0d+5l76COsXp88srtGZQHU+AwbP3HwDiwRlnE="; }; patches = [ @@ -39,10 +39,13 @@ python3.pkgs.buildPythonApplication rec { asciidoc # Man page gobject-introspection installShellFiles - python3.pkgs.setuptools wrapGAppsHook3 ]; + build-system = with python3Packages; [ + setuptools + ]; + dontWrapGApps = true; buildInputs = [ @@ -53,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { udisks2 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ docopt keyutils pygobject3 @@ -76,7 +79,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; 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/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 index 3a4d6ac760856..748dd7fcf18e1 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , gexiv2 , gobject-introspection diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 2e7189dc484b3..cb6033fa4b62e 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 @@ -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..bc2d73869a601 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; + hash = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; }; propagatedBuildInputs = [ @@ -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/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..4809462740cc6 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 = [ ]; platforms = with platforms; linux; mainProgram = "wofi"; }; 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/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/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/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 47aee945971b5..edac4b34b0523 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.21.3-mo15"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-OKyJcmhlY8gfDKyBf83KHhokp4qA8EDyessTwKReaD8="; + hash = "sha256-eLI41O7SQUgNHFuMNT4W4pjAGDFe2plXuXmZH8QyCZ0="; }; - 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/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 38b92eb77b9f0..2315810e03ff2 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -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/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/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 378db968c9bb2..776f5fdab2491 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -7,7 +7,6 @@ , flex , json_c , libmpdclient -, libxcb , libyaml , meson , ninja 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/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c7b3c3e52c940..00d3563d5b769 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b7eff35913c3b..b3b5d514a84c9 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 1c4ba79ee91b7..7119acd037464 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 63b9cedd7a299..54202f919669d 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } 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/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 87faa8ae0b648..afd2385fa5ba0 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.8"; + version = "1.11.9"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-lb0kjPvpjqHQ+DUdrQmaSIaxEdwsOq29RTe3zL25NQc="; + hash = "sha256-n6uRXueDq4rsuNdGNe8mbaHXszeNd5Nygq43p7XI9mM="; }; - vendorHash = "sha256-CN+2+aOOPF7gouvp7lCfRIKA1quNCcrvzHg8lF6J4f8="; + vendorHash = "sha256-uTMkUARs8XWDmpI7NHu+7BmEPnutkUSmcis+8uDLUH4="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index f36cf28b2d05e..1451e4bbaabd7 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; + cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; nativeBuildInputs = [ pkg-config ]; 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 13e1a71d45e02..923a23c489b95 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -4,19 +4,19 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.isAarch64 then - { + rec { pname = "brave"; - version = "1.67.123"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb"; - hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-FP+Afk62/aiKd6ZPX0zy76bzO3pJjm4pqauxluFYEl8="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then - { + rec { pname = "brave"; - version = "1.67.123"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb"; - hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo="; + version = "1.68.134"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-l07sbkM5gDMcXeMoWiWH/8nU+Y0ShyB2jIHsqEFaoew="; 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 01458f7001828..0a4345593bba4 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -62,7 +62,7 @@ # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API , vulkanSupport ? false -, addOpenGLRunpath +, addDriverRunpath , enableVulkan ? vulkanSupport }: @@ -187,7 +187,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..04fbbc349419e 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -24,18 +24,18 @@ cat > $SCRIPT_DIR/default.nix << EOF callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( if stdenv.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 - { + 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..a3333b7b5919d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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 @@ -196,10 +196,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 +224,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 +267,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): @@ -363,9 +388,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 +404,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 +490,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 1998972cc2178..09b575811b83c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 { 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..967f57d1d4d13 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-Evz39J4o3FJdJbYsFxmnLiZ9QiMeZttcbTtZ6wAVXoQ="; hash_darwin_aarch64 = - "sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac="; - hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ="; - version = "126.0.6478.126"; + "sha256-4Dkdi5C6dcuEewYvy60F5m4ynzb5lGWrJFs1Q+4vapI="; + hash_linux = "sha256-Lls/gwyA28G8X41wXEIKlgNdmKWgWnPf6iHZGrU8e54="; + version = "127.0.6533.99"; }; deps = { gn = { - hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; - rev = "df98b86690c83b81aedc909ded18857296406159"; + hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM="; + rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423"; url = "https://gn.googlesource.com/gn"; - version = "2024-05-13"; + version = "2024-06-06"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-VKPlcBfS6iw4E1nz0nYJLg273XmJ+RcGGktRbqQTTwQ="; + version = "127.0.6533.99"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; - rev = "df98b86690c83b81aedc909ded18857296406159"; + hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM="; + rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423"; url = "https://gn.googlesource.com/gn"; - version = "2024-05-13"; + version = "2024-06-06"; }; ungoogled-patches = { - hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM="; - rev = "126.0.6478.126-1"; + hash = "sha256-4LfYBqFQ/e/ePaOTSFBpELt0ilo/Vohwnwp8FvkfavU="; + rev = "127.0.6533.88-1"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-nZZ2yrVu+0TloMaM455bmyeoeVnfeGR3EGubAf8snNU="; + version = "127.0.6533.88"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index df8d45d50f1e6..21d39c68fdcec 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 = "130.0b2"; 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/130.0b2/linux-x86_64/ach/firefox-130.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "91b9fcf837ffe54df7712f71b608b636464c8222e96d39f6714db4939848e47f"; + sha256 = "32f2f06fb0c00dc6e299453182da8a25fbf172ab398d6c984bcf35ff3a9ab4d3"; } - { 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/130.0b2/linux-x86_64/af/firefox-130.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ccafcb76d6f4635edef530be87d8dd4762c81726b5cad9c2cc3662bd65360ba3"; + sha256 = "a73e3bbbbb7c0ee46be12cd93a2c8c32f0664ed9b6480dd619a0d1a771fb6713"; } - { 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/130.0b2/linux-x86_64/an/firefox-130.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d45a54fbf050485a3513ed4420d6d79912146fe6255e1bb9d0c8438222d20899"; + sha256 = "12cc083d2b13aef55e13e5010c9ce37346bd30a7e1b29c59cff59c80a5914627"; } - { 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/130.0b2/linux-x86_64/ar/firefox-130.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f0304395c3c4e8d8be8dbc5664dffee5c2f788d4bafe304d1ab4db82e76077ce"; + sha256 = "6d97cc24302ab864390d7d1dc7588fceb4acf563d9a28a0e877081053dfcf1ac"; } - { 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/130.0b2/linux-x86_64/ast/firefox-130.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "fbd5d17af1d32899de32d5e76f0da6bc9cc232b524f08ed1592eea3f03138e67"; + sha256 = "16cc8628f76b0591a4287996c5c648956f7cf45d4f7deccf09e50dd748a1a18e"; } - { 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/130.0b2/linux-x86_64/az/firefox-130.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "cc41ca3a46ace0c4e5bd2e0d503ddbbf92730dbaf24bb4c32b15481a51331ea5"; + sha256 = "bd5eff4c5dca6d313ceaaa46fb59d90fc6854e860ac9e708b1b31b3354eeeee7"; } - { 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/130.0b2/linux-x86_64/be/firefox-130.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1aea189544651679d4d590d7eb9de7b59290df85d738dd1e97575f863352ef7b"; + sha256 = "32757f8686419e7f267aaaacf0ea913389b1fb700ef6cfaff78a9fddcf70ce0d"; } - { 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/130.0b2/linux-x86_64/bg/firefox-130.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0c191744aac8dcbea9e7047adba99fca2f44eb2456884ced55daefaaa947e14a"; + sha256 = "ceea76edd205debbe9f823dc0998b7ae8983b8fb081feaa904d7e17efdfd1343"; } - { 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/130.0b2/linux-x86_64/bn/firefox-130.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "83c7fc7558574813a920d3f9fe07bdd7163585eb82a09d77e889cdac6e684b81"; + sha256 = "9a80b2b4f22398f27fbac7c6d7f4897b3b7f67d3e7b252062dc8337260fcd33c"; } - { 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/130.0b2/linux-x86_64/br/firefox-130.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2cc6397f3c67a46c01f9bc0d891c781239312277d60be79bd3152156fcccaf9a"; + sha256 = "1dd3aad00a8690f573b6209ed53de046a9b22db14f911a5a7c15fa24ad0611aa"; } - { 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/130.0b2/linux-x86_64/bs/firefox-130.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b75ea133c0237d67ae6480a3754d7edb8757e4bfc3517fb04e3d143f0abe70ef"; + sha256 = "2b3ac30417aeb15245133be5fb70414b5661faef161747bc8922c6d667a883f3"; } - { 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/130.0b2/linux-x86_64/ca-valencia/firefox-130.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "658cdcb9fb3b12dae8b8f11458c36955afebd60cc2578b544a02c975ff8522c3"; + sha256 = "511d585cb868d7ed6fcac420ebbf282c9ed228273d5c7a0348b2ca5ea890bf07"; } - { 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/130.0b2/linux-x86_64/ca/firefox-130.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b4c12e3a8d4ceab2eed6f29ac27f3e38ee8410ea49f809021f30915357a237a0"; + sha256 = "4cb0cbf3817acd1629e746efc50f064d78e557945e3ef76159813c602099a5b2"; } - { 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/130.0b2/linux-x86_64/cak/firefox-130.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "496fb9b680714e84895c1d88a56443a9c85fd983d3a95c647a9fdff348db9145"; + sha256 = "b49901b5a1437d7e97a33d91a3c51f2cc2685811f4d5cadf6a1f58d188a3ee97"; } - { 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/130.0b2/linux-x86_64/cs/firefox-130.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e9a9859fae4b699ea2ede1646f49cfc2663519850f58ddd72c97e8d82dc8b04a"; + sha256 = "4dd0ada2241859e5789805ae571262c22240a843cc4ed80980c25804bb096bab"; } - { 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/130.0b2/linux-x86_64/cy/firefox-130.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "806f6d644c8c3dbb7c150ba4b984185ed669ade7841240b2c4135f18b6808923"; + sha256 = "3fe97434c7e718796cbc4a3d863be920c9310e0f1545e2e4692473f6ae3b6fa0"; } - { 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/130.0b2/linux-x86_64/da/firefox-130.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bea3bd58f51c4e1041e2d4694f56ea27efb7e31b2df24fca43c77c7b5e07e966"; + sha256 = "0aed8fa23c42673d57bb672f386521585283d847d052c63957ed7ad8a06a6b82"; } - { 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/130.0b2/linux-x86_64/de/firefox-130.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "fce8aedc5386ce726be545ecd6e8ee9aca700fada5b366786a85e48e7e1e477d"; + sha256 = "bf3e1f8681fef2c1c78dc9fb32912856f0865d415cff2e6f250d66b737dbb192"; } - { 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/130.0b2/linux-x86_64/dsb/firefox-130.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "660553433ef3117f0caef5029e13e9edaa2b7800dd01e3f1f408a34cf5970d5c"; + sha256 = "3339d19f6c2110daaa5a6d5efaa6535dc1ddc50b96970d763ccc6fbfde936253"; } - { 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/130.0b2/linux-x86_64/el/firefox-130.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "edfdac7737acf7f3d63a1a65900b16f640b788fd127df19b9796d05c1e6ca630"; + sha256 = "1bf8b2f60a1d7a663a468e043f8989dd94e7316902550fd9293a3e1b11aaecb9"; } - { 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/130.0b2/linux-x86_64/en-CA/firefox-130.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ac420dea854ea1e7ac5e408a54fc5590f341edd3d7a2632b56a6b77edab80ba3"; + sha256 = "390eb22078d3a6edfd617fe12ad9a8a0cdb084b685ac4a5a12e8ad9bde6d6519"; } - { 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/130.0b2/linux-x86_64/en-GB/firefox-130.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "44efa47918922d1883c7844b91ff03ff756eb5bdd726d35db92875048bf7381d"; + sha256 = "db83796e7ac98244a40997f5a601c80cee21bdae932117a40862e5000a78f087"; } - { 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/130.0b2/linux-x86_64/en-US/firefox-130.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a44bd8e6c0cbdf28e270190f5dcaab0b803103509f556619047990551b7bea2d"; + sha256 = "b4afbc5e987e84daecb3802e19d0daad15c4f522b66e15d443324e66fc0d04ba"; } - { 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/130.0b2/linux-x86_64/eo/firefox-130.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2128ff79b43fdc1e8f61135a83c77d2413250a24900c349e520147eaf7bc9152"; + sha256 = "1b7a0489417d9b174eb72fa49acfb70d6cc7327f0d0535ed7e70da4cc150b17d"; } - { 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/130.0b2/linux-x86_64/es-AR/firefox-130.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0b4c2cc2a8256665284e3dda0ddb9170fb688ddb5eb02ed0d1e377cef2632b22"; + sha256 = "ce1178c4b8e733b9da83ac5e318dfb37997da631420544838318a3d75ada9a8e"; } - { 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/130.0b2/linux-x86_64/es-CL/firefox-130.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "10be1cdf825a91f337704e4ca5cb94bbf6f1c2d50719a13dc97c24b8f65a129e"; + sha256 = "02e6a34539e9c89c34bcd737996397fc69c2bd9666bf081861d78db34f507982"; } - { 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/130.0b2/linux-x86_64/es-ES/firefox-130.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "29cfd6972bc67dfa4e9bf4e57a0c28cba229f35c54457819fc0ce1f661f73ee0"; + sha256 = "3b7f99aed71fe41aa5981e601722539ef1d24d0f3f3fb6db433d3f0ff34c87d8"; } - { 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/130.0b2/linux-x86_64/es-MX/firefox-130.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e652e6f9a61a21f992cc81adfdbe506dbd1fafb91da6519e870d65e5356a3951"; + sha256 = "e73565132c5299806ee80c998d62ed191e8bfc34caff49a618a5c8da68908cc8"; } - { 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/130.0b2/linux-x86_64/et/firefox-130.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "086736332b848acd6a8c010596331fdd468e59835c202ede90bcbf66a326fb7b"; + sha256 = "d296dc6a32abe0d76b055ff242a67f2e78edce53a92fd09c3c2bd47daf7960f9"; } - { 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/130.0b2/linux-x86_64/eu/firefox-130.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "817eafa8d1c57a99a2e51dcb813d9d4032bc17ae67e6e48cf1b141e87899049b"; + sha256 = "b8cd6653c34114c36ca98ada18325ed0fde7624a04376203fc0b42ad252bea45"; } - { 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/130.0b2/linux-x86_64/fa/firefox-130.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9d09bc0b7f3f32b483890d67b9991a72b9492e1ad8be3418064f41fde5bcd5be"; + sha256 = "481ee6fff91887455ce6186dd1562ba646e52a97c6aa024b10f654d556da1653"; } - { 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/130.0b2/linux-x86_64/ff/firefox-130.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e6221fe30617ff74633292ddf5b0108e3a2fb7f3dd96b33df53eccb46ba4bd8b"; + sha256 = "f4a4c6724bb29262c808a9f560dad9275edaa9d06edea15c617a60bfd5052994"; } - { 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/130.0b2/linux-x86_64/fi/firefox-130.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5dfef84c2c997de1da02cb3eed105babc3d981d34649747eb10ee73fc63fa32b"; + sha256 = "08415b02f52c683f5eb2f02d4e1b73f5002d30b5cba80126001921e201c30af4"; } - { 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/130.0b2/linux-x86_64/fr/firefox-130.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e6bbe850823430b63b8a9815e2dbab02cc1eb470a9d5c88aa1a079fa3ea12f9c"; + sha256 = "b3d360e4c1de1afb46cd6a85848eba13bddab9489df611a45d832ce6fd3e507b"; } - { 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/130.0b2/linux-x86_64/fur/firefox-130.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "1c0e9148fcc302bb29993b0bfb21b330ba6a1b319acb51b7fabc8fb20d0af3cf"; + sha256 = "06ec07bab22b0ff4b68064992e51981b6ae715a67a74cc8dec866206b1ea9dd2"; } - { 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/130.0b2/linux-x86_64/fy-NL/firefox-130.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3953327d4bfd475ca743b51cf2613c21362fa48241d9e720dce61c10c6d07a02"; + sha256 = "2721766c1a2b01eb010e6b8c78d6fa7baef96de3695467d40e52934101976b3a"; } - { 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/130.0b2/linux-x86_64/ga-IE/firefox-130.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "08a258714e5077881ffdc1f3e2fabdcba46d8eb035c2e45cc5cdf9b78255b698"; + sha256 = "1457f9ac6789267ccd55b6e12d1e5dcb00a7ce5841ec0c6aa29282c3c8c01218"; } - { 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/130.0b2/linux-x86_64/gd/firefox-130.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a8cfed3eba163eb7d83da7d752752e50a66f763e7bc96947d28c843707e6a815"; + sha256 = "2151c145079aa319d26aa378d7727729e2736a0432e9ae9226614b5a3682a098"; } - { 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/130.0b2/linux-x86_64/gl/firefox-130.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "96c78ad70db34895c9b0de2f282818c8a8be9c328ccb86ab4b34a05f7e884756"; + sha256 = "4c9dcaf293c5a2878e52b94e1d58ceb8d8ec70170c61b3aa4c916611c9619e45"; } - { 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/130.0b2/linux-x86_64/gn/firefox-130.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9ca592bf9d78aedf2bf20213ab1494c6b5c0dc668dcc2a3d1b1291a6cf198468"; + sha256 = "62209e27ddea2ce84198a7a5c577cb7e5bd5814f608eaea5eefb7eff2ceded71"; } - { 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/130.0b2/linux-x86_64/gu-IN/firefox-130.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ce4bb8c67dfdde7a0f6ade7af2408dfa29af687807e257b756235e8f0ce873cb"; + sha256 = "f1259eaad5278415c883170d084ef6016142310774c5b11ae8c40e94d8051dac"; } - { 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/130.0b2/linux-x86_64/he/firefox-130.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9ba5ab6c7f2802f70098ce8aa01d575eeb7b0f58dacc10db1c4c99ede96de5b3"; + sha256 = "36dd3dc78c85eb7a3fd80d4a8f99496331ef8e17be7759ed12bc351bf39e735f"; } - { 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/130.0b2/linux-x86_64/hi-IN/firefox-130.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f9a9f3da6cfbeb6aa4a8f1f7865e7283b4870f4540789fbf944143b700686c95"; + sha256 = "e457ac7e7a82cc5ba8d9d85ec65f9f966cc867086a387ffa9faaeb0af3dcde7d"; } - { 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/130.0b2/linux-x86_64/hr/firefox-130.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b49e9f643ba870955b696994c552331453a84861f124f37014883c9cb6a544cb"; + sha256 = "03f2fb0073846e9b7730d300c7c91ad3014c37213e3f051cf179ff52ca772dca"; } - { 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/130.0b2/linux-x86_64/hsb/firefox-130.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "23ffe338d1aa10d63c577013d393ab6b13cba618affef5d7771712fd0596e51b"; + sha256 = "ac3e66908fbddcb4f4f78e74dc65bb2959533355017c12f33798ff19d2887339"; } - { 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/130.0b2/linux-x86_64/hu/firefox-130.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6dfbca5bd230abf413a0a149a6cd6cd21a61eae43be69f5402a9ce4baba48620"; + sha256 = "ed302e300926c2a9c23c9418f3fb5d1889508cde274a713cafe9e23188dac41e"; } - { 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/130.0b2/linux-x86_64/hy-AM/firefox-130.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "27c5564db6989ab00ea76734f375ca795472571d7f4b6fedc5135b071d58d97b"; + sha256 = "f736210fe63258810e9ee71a13d6c0ae9ace40b6e3041faee4c3dd35ee16e354"; } - { 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/130.0b2/linux-x86_64/ia/firefox-130.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8bdfd372040d0e2b2800eb9c66782334875b119f13dff164aa7320ff39856bce"; + sha256 = "f37c963c51f16dd966cf4cbcd1eb24938cf94510f4b059e933c3771d267553c6"; } - { 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/130.0b2/linux-x86_64/id/firefox-130.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c9c2fc719b5502812ba5ee64351b48c10917880625667f0a0f00e02703cd77a1"; + sha256 = "3560b3f96a52ae7e07cfce077400f6e06099948afd45cb733661abda9dae09de"; } - { 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/130.0b2/linux-x86_64/is/firefox-130.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "fae14a04c6625a07bc73956ba990dd7e488e130a60770c89175eca6ac86cd387"; + sha256 = "d0e24244b69958877cb4f228008a400759a91f57edd14f326f5ca3080f8cbc5b"; } - { 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/130.0b2/linux-x86_64/it/firefox-130.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4a28824f54e51f24ced026f78ee980e2e36802dddc800d1a0b02517a250f7ada"; + sha256 = "b8dfbbe048fe8a0de413e803f815c78da62032ebf9d1c24e4fa2aa7ed36fd012"; } - { 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/130.0b2/linux-x86_64/ja/firefox-130.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "30401649d210eb1caf484548de20c260a6a767018135502068cbdea202eebcf6"; + sha256 = "c1cd2d620100efb18c26ab4afe782a8f336abc5902d96dfd10a431a55128dcca"; } - { 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/130.0b2/linux-x86_64/ka/firefox-130.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6355e66d1428fb69d1c900d42440d73b0d59bee89146dffb7af457ca411b2aa1"; + sha256 = "a2eb1e7864e4fc3abd54966240cabe6c9571a75ce845938bf618e833a5c1c9a6"; } - { 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/130.0b2/linux-x86_64/kab/firefox-130.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "52d5431b2d7d5b0b3f0b1bd67251f65146ee653bc78fb16c84f99571c01e6bd6"; + sha256 = "f01a35a8a41844d2f5569c21b69c3891ba74173bfe08508c63d6aa527c854b0e"; } - { 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/130.0b2/linux-x86_64/kk/firefox-130.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "03d0e5f8a5b60389448aa74fb94b865237778da749dda7819fc23a585e121b37"; + sha256 = "32dd08417033e785d4a1f85e77f1ed1f3d4670e65cd2c9237c1584cb57e6ecda"; } - { 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/130.0b2/linux-x86_64/km/firefox-130.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e049a895091f181e91288ab79750d9972e22afb45b5b64c61832a654f9972c57"; + sha256 = "0eadca878bc176f05f1c4e944d7bd9ee8d9ca2bb585ecd3b5f70fbd3bdc27cfb"; } - { 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/130.0b2/linux-x86_64/kn/firefox-130.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "705aa81ae0963aaf689fd5cafa60e293f7d281422d6ad127dbc7c9ddfa0dcfad"; + sha256 = "5f0fc77a6de113892a0e74ee0425d980427d8b090eb56c5cfcac81aa00c99ca2"; } - { 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/130.0b2/linux-x86_64/ko/firefox-130.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "82e2cf3543a48a0678338200309730fc3a699f7a984f1014c0ba8c5945bea518"; + sha256 = "bbe82b836d9007454eb254ba174a2d1832bc778bbdcc113da23d8783e0bddb7d"; } - { 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/130.0b2/linux-x86_64/lij/firefox-130.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4cfed1c937cfb45b1ac05c4ccbde72275644ab95d4d6bab2943ada5ba81f5b68"; + sha256 = "7c86ca6ebcc78664ae7d4e6284b1e79abbf02c39cea51340eb54348a6523397b"; } - { 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/130.0b2/linux-x86_64/lt/firefox-130.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "24f865bb38ad0c2d02e51840649b4d827836edd1f706393d16bb43b63f76a835"; + sha256 = "931d12f97435ffe7a214652abe8298e0ce960176d9b31b4945a380e707a01bce"; } - { 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/130.0b2/linux-x86_64/lv/firefox-130.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "fbba425695890a2be1736653dc4c49c94efc17d09cd883f5e137afe212fdb25a"; + sha256 = "7d144d7f177343f46d16fce19e33a2c6bda102e02a1940f8f5d70779a7f38ea8"; } - { 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/130.0b2/linux-x86_64/mk/firefox-130.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e8773525b7f2c0fc82afe01457c7074899d968675e9bd293264e22403b4be8b3"; + sha256 = "0a23d158821ab8f711fa87192ea3c1d0d1c6ca71518a41fb91be81b0e32b3915"; } - { 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/130.0b2/linux-x86_64/mr/firefox-130.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7a790e94ea8cb0019d72f11d1110e1035799b9e9d2e6ebfc5cac502c94db8f68"; + sha256 = "4a2eee82794a46b60d7cb9c8231313b175c2d662378b89354967bc2209f44a5c"; } - { 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/130.0b2/linux-x86_64/ms/firefox-130.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b2c32fa4c9d4eeebefea7b235b91a56e2ca3279c02f64520fd8e68048d190acf"; + sha256 = "17240afd4d475fa4a2ae7e7afeb886512e83cc597bc66319c4e7ed47bf3c1e26"; } - { 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/130.0b2/linux-x86_64/my/firefox-130.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e247dd90ffed9fd6dd8a7cf8667a934f211fdac32ae853b3eea803cb490caa9d"; + sha256 = "d7de50c3a8486404c94b4234069f0b89596d05ce3aa08ee7ddebce98c1d88a5c"; } - { 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/130.0b2/linux-x86_64/nb-NO/firefox-130.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "843e3303bd29807c2c4f27368173e0f9c32fdb16bb2c151d47c5b5099b92dcb7"; + sha256 = "6bed8ab5cebbaa40f9f0e88e6f479137ce66a979d8999f16fe60264f6847ad16"; } - { 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/130.0b2/linux-x86_64/ne-NP/firefox-130.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f88683ca97cc178aad54d921aedad7ba6207f9320a5fbbc2ba0d6d7d7ef8f46e"; + sha256 = "d3d2051e9e9fc9367f1bfe743827a759cba17bd86f3a3dcddfed02fe9ae4aac3"; } - { 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/130.0b2/linux-x86_64/nl/firefox-130.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4d06e59feb4b38fa08197ba3aa4e57d97265f04c8d7c5f8de31fefccb4b38601"; + sha256 = "5f7ecb9dcf22e58c843336b5514e13d0e5b831c26731aff37fa1dd9226668b1f"; } - { 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/130.0b2/linux-x86_64/nn-NO/firefox-130.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "91d60aa0cf396e2f332c2c215c92d0dee58cf484c46ff3e2148e974faed843d4"; + sha256 = "74574486fbc38a9c827465613ac35f9d3c047412556ecbbfcd9195a57da0a674"; } - { 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/130.0b2/linux-x86_64/oc/firefox-130.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "e51325109a7d1a4e5277abc42e1bcce67e6872210f46412fda78c56ea0a5ed48"; + sha256 = "116b7dfecc231e1752cfda4e003567e12eb7025119bf9f6b29f05c387a85496c"; } - { 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/130.0b2/linux-x86_64/pa-IN/firefox-130.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c2d0844b1e1dff71ff68498e8a8ed95efb058ff2e9938950d198fca0f01b2465"; + sha256 = "ed3f651bbb97b134de0aeab6604d3239433cac0781ff32270273ba77eefa6692"; } - { 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/130.0b2/linux-x86_64/pl/firefox-130.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "417a7f871b5a5ad8292d732382e945fbb5cd52cc114659e78e305dffd532d98a"; + sha256 = "557390db4a29bcf9c21526c5f90c21072a3b43cf30cea08b58c63f2711990497"; } - { 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/130.0b2/linux-x86_64/pt-BR/firefox-130.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f9cc05d47834d2cae826b72efc2c66b7d78fee9d0e1a49ebca4c95f7d15d6efc"; + sha256 = "bf329696d5ec6aac9d8a59804d40467c8ac51e1c4f33c06019444f907b25f947"; } - { 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/130.0b2/linux-x86_64/pt-PT/firefox-130.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ac12dc95c8558f67dd648d383d6f71d66fd01b408fdbab01f63a4d80e64f4945"; + sha256 = "4dfa6cfa0a77a38408d61135d773fa67a28a12bc4741995f226daa9bd564b20b"; } - { 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/130.0b2/linux-x86_64/rm/firefox-130.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "727ba61e6d215858c92a9242ff2826d8ca1d63acb92fe9807bc9896495a47e42"; + sha256 = "b2f0f466a204d027756a138c828aee60605e33a1bdaa74df9cd317f6f9065b85"; } - { 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/130.0b2/linux-x86_64/ro/firefox-130.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c53ba875f108a47f0c19e1956f988b1dc2882ae9fd28321c81254b4861b0169a"; + sha256 = "93a49561ab7c067e07287761ad4bb68426e3c0f17f63b9d1eafed8b44993cdd4"; } - { 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/130.0b2/linux-x86_64/ru/firefox-130.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "015278da272c3c91fd566aec8d7f7d155cd1e38406049b136cc4656fc2a23629"; + sha256 = "be80ce130ac70dbd13c23cd0d3b32be691903af4ead0ff83337cf8ed3cb29070"; } - { 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/130.0b2/linux-x86_64/sat/firefox-130.0b2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "5954a27e1dbe063dd3959a93d472e73e9b609cf57e3638e0332b354ea3628bfe"; + sha256 = "53c8e996c3aac626e15ec4d88b9faa791b4ea4b7e5d37a658a951e506692fa1d"; } - { 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/130.0b2/linux-x86_64/sc/firefox-130.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4e8435a0716f906830ac75c9573ecb36279cdc1f6321795a45f75daf08c4b41b"; + sha256 = "2d37ad1cd1794101e1809900f4bbfaf2ad6a211c6fa0170a9ab8f038605971df"; } - { 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/130.0b2/linux-x86_64/sco/firefox-130.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "ec1bfbeba046492deaf3d42cfeede879413f85b7eb4e85c9ddc064660c088860"; + sha256 = "d07af060a5d5f1e49fc73deed9ea124cf441c258353dc015087541cb8331cf58"; } - { 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/130.0b2/linux-x86_64/si/firefox-130.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8fcbd1ef4c1dee115d60649c2c47439e9799ccf8a34d9aa09d6bf0d5d62e143f"; + sha256 = "55339369f3bef6782f6490ca4992f0ab85a9da9d661cd8b60e4f35ebfdacb368"; } - { 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/130.0b2/linux-x86_64/sk/firefox-130.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "695616f84bbfe2c7a4dae8d9d30068419fedc5448a26733e4f5f35fd1c5c4002"; + sha256 = "b42e500c2ed242cd98e46faac69c37e90241710520cb969778f2e91aaeaba7cf"; } - { 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/130.0b2/linux-x86_64/skr/firefox-130.0b2.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "0c53f9fcbda34c8df1d3495e447835fc6a6b7e1ef41c1b65c3ffb3f6e92060b1"; + sha256 = "910d4b98e8b1d664b2cba09f828cd2fb70af36b6e6e5901cb30c4b68eba9c264"; } - { 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/130.0b2/linux-x86_64/sl/firefox-130.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8d9b8253d25bc88667c3123a2d4c134a9e8fa4078f992b41ce8b3b8abc192393"; + sha256 = "ab5d8794d5a73d4aa77189c62475340b988ab9db03ce4861054d5db3f975c429"; } - { 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/130.0b2/linux-x86_64/son/firefox-130.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ac4706045196b94245466b8ca8ce71215ba23937d675d883ad926c8cf6a3be90"; + sha256 = "f9e980d9a52e95108357dc8df7e216e15dfd7daa4eed1aba6bc426ee6023e2e7"; } - { 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/130.0b2/linux-x86_64/sq/firefox-130.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0d40ee306d601eba916d19cf89241e7a7dcf3101d33e3834c4fc39f37f06119a"; + sha256 = "4641530000018143b5696321e7358777ffbead0fc18c65f27e01c6ed20db6955"; } - { 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/130.0b2/linux-x86_64/sr/firefox-130.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c27e8606ae5dac9a957b3dedb453e1dc9bf560b73bde942d84b20ffa51d49339"; + sha256 = "981b61c4ef02ba23da128d11b1cb3d5b2554f03b769cb8cd37bbca59309cd1af"; } - { 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/130.0b2/linux-x86_64/sv-SE/firefox-130.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "81f2fa7b349b207482a013a4f693bf05be6ea0baddbc6f5ba0659e6b72fb4f9a"; + sha256 = "93c1642df4aef1419153f747dafb905124106d2a4244df150c1e17abc897cdd3"; } - { 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/130.0b2/linux-x86_64/szl/firefox-130.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7f6186f6936d343feac7eaa0de4c3e1359011d7a7785c241d56757db9926b186"; + sha256 = "f109a07ad914a1bdfc65d4ed79bef022ee25f3cab494141e00be2af65ee6cac7"; } - { 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/130.0b2/linux-x86_64/ta/firefox-130.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "59414f762f5f5de1e172f71204cd21bc3861c3fac65fb7eee64c1dec1617ecae"; + sha256 = "68074b1e872e8f9e5a4b9c02d8e973f9ac51fb7e2bd431b3a56922e91e5a4c78"; } - { 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/130.0b2/linux-x86_64/te/firefox-130.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "511c1d35bb3caade5771e060ada9674a0bc4917d4da806618678b04618ba17c0"; + sha256 = "f3af7defc9598d56638c83c9b4d2bf8fee372b3d3b00d76c7a9679205a2746bf"; } - { 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/130.0b2/linux-x86_64/tg/firefox-130.0b2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "4bd660b137d7240f4ae6ccb15ac750556edcbfe47e6a65e1c29d8ee599b953f5"; + sha256 = "c07fba4163796a71b7cfe4b06c76bf83ca0fc493660210db224c1d72fc64241c"; } - { 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/130.0b2/linux-x86_64/th/firefox-130.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "19d1641e4904bc4ea993dbd4d8a84538a4b88294721883e27df8db649a7993e9"; + sha256 = "40ad12187db69337171664595a38ef19929eb26cc923816e28671462a72a6746"; } - { 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/130.0b2/linux-x86_64/tl/firefox-130.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "4dbdb2c35ab40bcdf43ebfdd51848115dd617306f44878d8b2d0c2f562da8095"; + sha256 = "aa8e50fa88be92752bd00c2114bf0698535a2ef70764f2f6d1244ab779182ef6"; } - { 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/130.0b2/linux-x86_64/tr/firefox-130.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6f267217aec01eacf239957079a792119bdf9ecd988835b4efee68d757db682b"; + sha256 = "868c77177dce5e5e2cf54cc70ef3689f22e58435a972c2bfd32e6bd1a4b450ec"; } - { 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/130.0b2/linux-x86_64/trs/firefox-130.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a0a1c980dcff845c2aa858e1a44a50b00fa0378443736abb3438fc86f9826d7c"; + sha256 = "96e4606795f4212cd78865fe0592c030e864b87f3e6ca80c486e17106eedbf05"; } - { 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/130.0b2/linux-x86_64/uk/firefox-130.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d0fdd0b81afb141faff7605d302d1934788968ef3dcff38e1078d3c4e14851c7"; + sha256 = "e4a968623cf2821c87a7663789489106b0bf811bfa49700f53fffaed90ecd028"; } - { 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/130.0b2/linux-x86_64/ur/firefox-130.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a680e79a663a58fd96e2d103b686efc252d3d9427808c7e760307862be1d145e"; + sha256 = "5111cb05702827c40ddd9604b852575b1949c910a5da861350bcbac2162cb520"; } - { 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/130.0b2/linux-x86_64/uz/firefox-130.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "15588e3d356f2bc8adbb69bd53ca9ca38b0304703bbe7a6e16879d334af766d0"; + sha256 = "7493c9bedd4f39f79e9666661221fcb9853bcae524bc931dbb2daef51aa36ab7"; } - { 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/130.0b2/linux-x86_64/vi/firefox-130.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "44ee2da45fe203fe8f890c0e6ce8af05accd3f1cf02c97ae3f2f7a49da3aee37"; + sha256 = "d2a47b94e9182c7636f7a6eb4814587a59cd2476698cee89cb36499c5b7388f6"; } - { 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/130.0b2/linux-x86_64/xh/firefox-130.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "70a378569879d37fecda5be44e88335fd156a15ed4fc52393956952a914f9744"; + sha256 = "22e8a22e72870fc928e69e1072b6a7c26adb3072dff5b4edfd6045516e0f7400"; } - { 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/130.0b2/linux-x86_64/zh-CN/firefox-130.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "453f1d607d2584386d91c16d69cb8ccbe752b3017fd472f2370b081baab87949"; + sha256 = "d761f7ec2aab3042de9e449eebc5784867e69729fa9e22262e1fd88525dbc83d"; } - { 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/130.0b2/linux-x86_64/zh-TW/firefox-130.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3ca21ae9b1b1ea51cc0d3bb1afce4f394752fa957a0f7d8d4fb047c9127d31ae"; + sha256 = "7f59a5f17564a214b8963cfb0f28ccc35fd4e6de92965c8370dc7b0093eb91ef"; } - { 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/130.0b2/linux-i686/ach/firefox-130.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f52c6e81e51c03463dc74fca1623c16917ee429fb916f5ce71aac557b7030a3c"; + sha256 = "7b63bd298072bad2d6328f5c1a1baf8a31f30a2cba6296d9e31bf3b14949a0fd"; } - { 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/130.0b2/linux-i686/af/firefox-130.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8bda42497ef0919306ca305b295cd9a85c9344c6be3a4d6b168b7f419bc76cbf"; + sha256 = "3673b0553707aa1b09aaad4181cc8c257ce09633faa681c9d0f7409fe036e47c"; } - { 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/130.0b2/linux-i686/an/firefox-130.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5090a3fdb62a77eadbd50722c3be9f56bb407240ea47e248ac56550e3a3b061c"; + sha256 = "d9015c7147dbf5091a418c84feacc91739f202ae1c6a48ea600a2e344fb1e95e"; } - { 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/130.0b2/linux-i686/ar/firefox-130.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "64f61f7e9838aeb571170d54b69c239855db32c4410d490275aab16df0c57276"; + sha256 = "85d049c28af55ed19a8d5e5a27b1e386edd9531222c4b77402ae362932340ca2"; } - { 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/130.0b2/linux-i686/ast/firefox-130.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "816ac6fba66a0f8e185108e8338d59e675bf1262477b416dd76b026ed1ef5f9d"; + sha256 = "df0afbccc6077c70261929e8b581a5a445263f8445b7a77f7dbc79f7e5a9f1e3"; } - { 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/130.0b2/linux-i686/az/firefox-130.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "cef18031c260d7c00ab43473c1072e7310702df92e40ecacb560a077dc56200f"; + sha256 = "aa8e05e2db98f8052a83debdefa76b279c69ae9208883dcef4b61a6d05ff5b63"; } - { 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/130.0b2/linux-i686/be/firefox-130.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "229a9504c02d632a611216f0b64662122aab2618aee4400cb44c162710087548"; + sha256 = "a077810699e5ddce43f74ba7b6609aac9be911828270847472cce997d71736d7"; } - { 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/130.0b2/linux-i686/bg/firefox-130.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6de9441655c9256b96b38b0c2318237ef7fdc4079d9a0a17370a4b63949f8952"; + sha256 = "7a7c35258d8f4a816fbc7be47836dda56dc02dcf799e966273c2b58695efc153"; } - { 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/130.0b2/linux-i686/bn/firefox-130.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0fa84544a40e254e3b5d363a5fd48e6f00a2bca65e71662ba3bc874db844373c"; + sha256 = "a903706bc127a34b5c649254598a027f5558bf695c634ae1ba9cbd571c7466f8"; } - { 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/130.0b2/linux-i686/br/firefox-130.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c3553966e4b2ebe1ca9fb0a4625f58644fadf660dc38f053c898bba8cd9652f"; + sha256 = "8fc1d8cbaa3993060a6533a7fc0896b307f3d7194117bcfb3651aeeb92d6b7a8"; } - { 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/130.0b2/linux-i686/bs/firefox-130.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1a7b0f5fd82dc2e0efe782d87e442c56c7ce3cc4c3c4ff2118bf11356134aec1"; + sha256 = "9ff6a558bf756b4a41aad41513c5e3af1bcfa13a39b7aa6e808ed44fb4a23dfd"; } - { 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/130.0b2/linux-i686/ca-valencia/firefox-130.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "73ed405344bbe118a1351834c1e73b0811d76db8e5ab17f59f17425da6e80284"; + sha256 = "84908a5501699ee273d9b28954f89f58a0090df7f9ca850aebe7a18b80cd0bf6"; } - { 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/130.0b2/linux-i686/ca/firefox-130.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f1d9e5e3ec259b3f860988c96b6c28430346ff91909f6ee4a4de64562d9cf632"; + sha256 = "5c877cf935bbceb5090229c49511c8e14f979374d89eb1e37b22be98f97b4262"; } - { 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/130.0b2/linux-i686/cak/firefox-130.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "85d8e7f0e98b3a0f6c19102cea11d4be590204ab27a5bc801028918aeda7d903"; + sha256 = "80a54ecc7157c0685741b8014382463f6f8a7996885793f2b52a0d24cd6b9970"; } - { 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/130.0b2/linux-i686/cs/firefox-130.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5552ca41e906180741330360c1875e7d14a6c8ffa436a45440377c4e734a1d66"; + sha256 = "edab1c40b01536b9a8651c9454ffd3f4f4db1ec31059e03e43b1940b8030c53f"; } - { 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/130.0b2/linux-i686/cy/firefox-130.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "e7a1796463195e31a7a8caa1f09344780deab06c9a3840fe7ed5a6316ff0052f"; + sha256 = "21e53ee632086450645b339934c854639654e0f1bca0d00a0222c3abb06c7ea3"; } - { 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/130.0b2/linux-i686/da/firefox-130.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3042716cb2af826d563047e6881ff01eebb9e13c32799c5e64f0a2d9207ef673"; + sha256 = "95a7761928c2e595d1c172c6cab5a170eb3144e312ebd88938530b5bf60c3f30"; } - { 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/130.0b2/linux-i686/de/firefox-130.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "952c3133123b81382544f454a76d52b8c42fe42e6a16630c5e7a60e5af004dbb"; + sha256 = "fa9690d6bca26353edb5649bf2bb0b4c990d43402efa18e5162f9ce99d08c634"; } - { 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/130.0b2/linux-i686/dsb/firefox-130.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f7d6e3ef16b75fcb51dbfd940beae3baeb8522b21bebefd56d0916ae79b32efd"; + sha256 = "e4aded68358ec362f7aa7c43f6d57e5ba2cb68e9699eba6a8d31f57ff6c09f8d"; } - { 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/130.0b2/linux-i686/el/firefox-130.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "57ec8938ac22aec300177f6399aab3f96a54ce6090017531b89a559e374f17f6"; + sha256 = "2d18d613e78610d3523497d633f414a5a14537f6b5c534a0f0fbdb09d1eb4e0d"; } - { 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/130.0b2/linux-i686/en-CA/firefox-130.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "77cd20e4daa94667e040ee418d76abd11fc8927ae667fb15da78d7ae9712b82e"; + sha256 = "d764d743a8827c919f5e262e7f3d92ec5bf6136c14674aa701a9bf4e7a3454cb"; } - { 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/130.0b2/linux-i686/en-GB/firefox-130.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "376231eedf5d4804109b6ef5363d77fa6f27ea59e56dd1374c3c499596be6cdc"; + sha256 = "2e2deccb70d5a1eb67b32005af4e824268b458f26a688c8d2d10a1b7d9f67f52"; } - { 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/130.0b2/linux-i686/en-US/firefox-130.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "263a12886beb8db84e7a5af38ad99061a0de6abd35da3ab186a46c31bb35b222"; + sha256 = "cac0620cdd0004f77edd1363550aae525c3a41cb9e7a21a6b0d9b8191eec2170"; } - { 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/130.0b2/linux-i686/eo/firefox-130.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "14be7e2ce4b24d218eeb58b0fa84b92097a9f3c271814d890f8d5eec93954d53"; + sha256 = "5928360ad8779acbb9bb559f8186d50b289d82f44b85a4f2ffb4766a030b4923"; } - { 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/130.0b2/linux-i686/es-AR/firefox-130.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "7436d4d5be4d05fddc5e172b42a2722c89d38277b0fa425a691d95561870e979"; + sha256 = "cf99775ef72de5424fed1bd78291ad7502f98718928819cb847f4419e5e9f098"; } - { 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/130.0b2/linux-i686/es-CL/firefox-130.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "11c157f2a52b28812b6c0a81b56d9383ae1401dd1c066c9f940f5ab256bd1a8e"; + sha256 = "2e28388a1b4dca0aecc995a560b9a0869c7b33dfa1bbf40c8f7636e96506d9af"; } - { 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/130.0b2/linux-i686/es-ES/firefox-130.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6cd4b9d8b073cf43d249130475f17fbfb2bbfe29017eb5d2d8bd53845213d362"; + sha256 = "dd7a22a0208467ba077b7b85e42d39492509128152e295222b0fe06184e89c6e"; } - { 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/130.0b2/linux-i686/es-MX/firefox-130.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "56f5ff72178597ba5e5d20aa296046340e2563364cd3ab00a0292c9fbef48e42"; + sha256 = "fcf7eaff8e24e8d01e260a84a930a44fc9f0ab481108ac8ac80ad8d0c2fca5e5"; } - { 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/130.0b2/linux-i686/et/firefox-130.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6e452e1b70d3d00b21b81b0738e1a7b61a8b2b54b41993b3c55737acad63e519"; + sha256 = "89066eb2df624d70f561ad4524e921a16389ed3f4d6b5491961c21a106ddb6c3"; } - { 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/130.0b2/linux-i686/eu/firefox-130.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "32a67b26a26affb5fe294dd07e660e046c1318ea84ccbbf7ce3461c60727fa19"; + sha256 = "682373ca3c68c6bde0772e28d9d49748716644024880b375e65f4cc948c84c32"; } - { 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/130.0b2/linux-i686/fa/firefox-130.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1bd6f9eb6e427cb4e6d2b11ef0634084dbe496f28753057157d23d05837f6ca7"; + sha256 = "8218935ed76216b6e199d3c9146c55ee27d92eeef18289a90fa924cb88de2ad5"; } - { 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/130.0b2/linux-i686/ff/firefox-130.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7995c4aac2b688cd52ff5f9bd358c3f12199c95beed9626c24cade384a3a3fbd"; + sha256 = "adb5b4f8c258993c97f917cb46fd0a9b1baedb0ed0bd7e20370035afe271d4a0"; } - { 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/130.0b2/linux-i686/fi/firefox-130.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "26703afd150a9f78c8d6f36c7cce38a2add81c79b66f11d21f998d7db198cce6"; + sha256 = "4afc7f4be4f9c28985abc5e363ba621028b846355cccb1f71619f1cb6e4a6769"; } - { 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/130.0b2/linux-i686/fr/firefox-130.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e7ae04d4a77857cd6775e466625d75983d600cc016d4629e353d5e8d280a1b09"; + sha256 = "583f6bbbe87c842b0684b0a856f81b658fa23a2e2d50b56932bc23e4ef080792"; } - { 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/130.0b2/linux-i686/fur/firefox-130.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "96b35eb88709069b9b18533045576435af1f900ee7b0f00c92c502852b4dc5c5"; + sha256 = "e916f7f3b82c25410d016192ff6118e05ab8bf894d314c012b2c4f78887fe55e"; } - { 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/130.0b2/linux-i686/fy-NL/firefox-130.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "999dd239352f0fd6e57029aa8d5308bc9deb25d05d63680255f6019696285ce8"; + sha256 = "f259783b26f91a9e464fe4de6c95d885dd39a737d23d493c7b9ea8195092a39a"; } - { 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/130.0b2/linux-i686/ga-IE/firefox-130.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0fb4d4fcd39d5a853c0e6fbb0521917d17c04e57d848610cd189d0846dc0869b"; + sha256 = "62150f6e9e142e52b77621f2331e529b0e13798ad2ce86f8fa8cde26bac99ed3"; } - { 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/130.0b2/linux-i686/gd/firefox-130.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1c19fd18a531671dd85d8d0ca0c797033dffdb23bef0771c4a828114ca9a80ee"; + sha256 = "5d78e89798d86c476116a7a04a8efbdf867da5228d01cf56fd189e0e00ceada8"; } - { 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/130.0b2/linux-i686/gl/firefox-130.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bbb1eeb336638d898ecb34ff69bfca6f68bb5629584e9cd90af36fb22d3adcdc"; + sha256 = "53d72e637d6e2fb999bc2d5b0865a07c5e1f1ae64974fb24f90cf3bc13bec115"; } - { 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/130.0b2/linux-i686/gn/firefox-130.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "340b80fc5aa46093c4f901058e35eafdc42233e99fc5fcc1473e3fd6dd60b99f"; + sha256 = "560d60eb1ca98ed7c6dbd97d7c3a0b97cd0675391ede775f64d62a2e98bf6771"; } - { 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/130.0b2/linux-i686/gu-IN/firefox-130.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "487bdd9bb5b6c25d8052a3dc21325f21a51c4581aed7b51f38e5e459c9ce8ae1"; + sha256 = "0c0854450654e6a06df93361c80e7ef8671fb06704a7562aade57ed65e707862"; } - { 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/130.0b2/linux-i686/he/firefox-130.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "93144b3cc3e7a7b6e929b928446223be25c21ff5faed04f9216f2e7ca716bba3"; + sha256 = "3aa4c8ccd42ad0f5cc4ff0adf2d8682674e0f0febffdc61a9a8ca513d6656c4c"; } - { 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/130.0b2/linux-i686/hi-IN/firefox-130.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "1256ec465f672194c759ed16acb45ead09965a65ad277bca1cc7ae0ad7c811d7"; + sha256 = "f28c6e5ae2f1c8082a10cbe1732bcef7df48ef734176f5682fde8df2a87c2778"; } - { 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/130.0b2/linux-i686/hr/firefox-130.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5fa927c1f64d60cc050377a3d03af7fc49abe13239cbc36f78798f171895aac2"; + sha256 = "c96d908c95bc025c6e30cf58d13ea7b8a9c54c925e6f985cb4ba3d77f9c36aa5"; } - { 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/130.0b2/linux-i686/hsb/firefox-130.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f806bb7d0ae916fdb9bb38feb77950c649a9c6312908aa5128f24a0e0690d2b1"; + sha256 = "219a1935b48f08370c423e8a40314e830de8eefc82465f06e6764d18cd29687b"; } - { 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/130.0b2/linux-i686/hu/firefox-130.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "be3a162af629186655464d3c560a7b2b84df17239cb140d42feb23876f320899"; + sha256 = "29591118fc299fc128a401323c0a8207b44fc7e5702bcc2262af1a2c608a4366"; } - { 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/130.0b2/linux-i686/hy-AM/firefox-130.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1b343636f58cc56c388a698fcffdb024ccda95b191e0ae6901b093021113d1a7"; + sha256 = "daba83c4d70501fc9925a67819403dcfb231250b401798615b0142e4ba0320aa"; } - { 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/130.0b2/linux-i686/ia/firefox-130.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "05ddf494a749b007d34a450e4204bc12e60c7b549e86496d7b4768df4c0cf71b"; + sha256 = "76f9e2ec34063b6d5899fb858f1c479379f84e6d15ef60521bc0ede7cdf97cc6"; } - { 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/130.0b2/linux-i686/id/firefox-130.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9119141c2a2a4ff814657a6f24ca3c1d62b3e5e607b5ef2913ab494630458794"; + sha256 = "373537607de55bcd9decf9882400783773c203034ef85edbd13c760554a5d6c7"; } - { 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/130.0b2/linux-i686/is/firefox-130.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8b91f199fd4905bb8fe9e1d3f745640975aa58761731fa54b1a24a7e40c5e0d5"; + sha256 = "f85cdc24c47dadf88a1801fa3d6e33e898f6ec67022980d46c406a5a79f06c97"; } - { 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/130.0b2/linux-i686/it/firefox-130.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "aa09600d53681b3a2bf512e287d051a2d3306a010835eb677ed754ffd4817d98"; + sha256 = "970e147f4d8fc6afc57067e5b9891ea14ce866e057c8b322e8738d4b76014af3"; } - { 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/130.0b2/linux-i686/ja/firefox-130.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "70fb659b22c26f7ee43113fced3aa98fd66f581227c8d56a5d8bc4c6bf9df863"; + sha256 = "981efc6798a45163bd724238daaf27a27632505e320c99d1a045ca73f4bc9671"; } - { 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/130.0b2/linux-i686/ka/firefox-130.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "652ccc32864b397adcd4b15d2c0da86287004ec7229aa92b65084f1f351c3d2b"; + sha256 = "94f814728f2c0617760dc6bc148c04817a3160ef0d5a29d3052c30bdf4701440"; } - { 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/130.0b2/linux-i686/kab/firefox-130.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e91014eaff857b5fc002c45f723e2cbe83b1701cbe9661c6ba0b52a19b621ac6"; + sha256 = "2e381178febaad9595e48ebadea1870c6e52a3b9e8b64be8c731371051967102"; } - { 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/130.0b2/linux-i686/kk/firefox-130.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "92bc97e900fc9d742d182b51f5f08ee39cf40e6875c7a2b9f1aeefc56adb96d6"; + sha256 = "9ead5889818c0fa8dc38aaddd7286fec3639939fb017d1546ee8f1256f6cbbf4"; } - { 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/130.0b2/linux-i686/km/firefox-130.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f06d799edaaefef5277a76537c1f0dffb55416d3733579d9bffd2d658d4c16b8"; + sha256 = "f5aee2fe01500a2ad9b7367ec4f77567528a38ec080efa243fc24756a7971f7b"; } - { 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/130.0b2/linux-i686/kn/firefox-130.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "73b00c3ce8795930afb41cc7b714c0601fe6a56fc760b91befa82c490a25ac4a"; + sha256 = "68a851da99f7c888eb7633631c94f70fc62ae5a28552646eb0f4424c86671052"; } - { 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/130.0b2/linux-i686/ko/firefox-130.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3b391cd22e89814ffa99aa4cc71902fbe13944f61b216ac1fadc60ef465cebb7"; + sha256 = "4b77874a6184da622b0bdabb81a29b2e4b266cef3e0e14e8e03ea2bc17dbff44"; } - { 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/130.0b2/linux-i686/lij/firefox-130.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "847b13a12d7adacf149047dc19b1d55991113b35a1cf506248d6360e25aa1c90"; + sha256 = "6296b2014b08708d5713427a9bef5a508fd4823e02ab98ba87c113e2e6f96ca4"; } - { 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/130.0b2/linux-i686/lt/firefox-130.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "550aa459d8a47c4ad1c33cfc555414d3e7dbaea052b0395972ebd43930db6399"; + sha256 = "f319ded0e1e65987e7dde7ad56f3c4ee0e02ea2b0b64ba23c6587e5ae0478210"; } - { 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/130.0b2/linux-i686/lv/firefox-130.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8f3b8a06e4f192591a0ede2ae19f91a4ed914e07e1e4a81bdcb5c279ab0353d8"; + sha256 = "0a758b50f893bd4cd3e02c5901325d17d5d22c859a2f8f5d9e90f29e4a2e5f16"; } - { 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/130.0b2/linux-i686/mk/firefox-130.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "441a3e5186c8179c2bc969499f98e9e2858fb03883aced701b5940d9eb9f5096"; + sha256 = "f7d0efd7343d53d5de3d80332fcc42cc1a390d1944b5a408060ff4afe591c531"; } - { 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/130.0b2/linux-i686/mr/firefox-130.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8d79dd19e2940e92e98352d6a3bbb1b24e2ac288081b5ff27a8800c2158b61d7"; + sha256 = "85d2314875c6383254adf665e32184448f51f432f06053b830f82432798b18c1"; } - { 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/130.0b2/linux-i686/ms/firefox-130.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "42f28f18a690c919c8d24632891eba9be4d76f68d4851f272e6be698b25779ad"; + sha256 = "b84cbdd1e0147cd9c24961ef73859d5f4e2f9f06b06415bac4508a94bec9a4b1"; } - { 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/130.0b2/linux-i686/my/firefox-130.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "a0457857e88c8333fef4a0eb6778868fc9c8b20e5019ea8e9503f32aa3d4cc45"; + sha256 = "34dd8c6669bc030aa6859567906fc7cdf759513501157d6adccc2ae3b9074724"; } - { 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/130.0b2/linux-i686/nb-NO/firefox-130.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5329741c2dba6e06099036fd929098a161fd7840156217fafbd51f2563be7f72"; + sha256 = "21ff31649a8ef0ab8e2b541ee4e198bedfddf43d66266675c09b50879a83bb32"; } - { 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/130.0b2/linux-i686/ne-NP/firefox-130.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3d38141d0bd291577e5f2a4d50ce0cdb7dd102aeb36ab9e54e01bea20f5ad58e"; + sha256 = "80d546f09fce76d7bb85fb82951b805b367518ef7b4fd4126c915aa37e515aa2"; } - { 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/130.0b2/linux-i686/nl/firefox-130.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "00521293ada2395463ab4ef44cc6269e7a3635c84e3a1a44e598b47ea4d8bd06"; + sha256 = "ce52c8f3f6691316cde7528b2ce66ea04244a3d5aaef770163508791a808d641"; } - { 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/130.0b2/linux-i686/nn-NO/firefox-130.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "f0f4e97fe329841b763a3f4860b3e34764bad64f667455234e3aed77ec577e24"; + sha256 = "636a0bc818b923ba9ccef6d1b8ac3cd34fef380c9ffb62b5bc1c5bfc8d4a1efa"; } - { 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/130.0b2/linux-i686/oc/firefox-130.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "a7bc839606bdc91fdef9ad18f574263579437fa3ea260d6f88df62cdbfe2eff0"; + sha256 = "2a4ff16c067d867148b2952874e48f107c4c340df4a793950821b3db9bdded32"; } - { 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/130.0b2/linux-i686/pa-IN/firefox-130.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5067a3e713640b3864292cfba5f7a181f3aa4183aea98c488072b6f03ca58aa5"; + sha256 = "110f8a9d6702e301a3cc0eeec8b40788cd0799829f521fcb60b437dad29c60b6"; } - { 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/130.0b2/linux-i686/pl/firefox-130.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c1a19f825218448546cca180631b7684d72152cf172f8d15339c9a477575631f"; + sha256 = "3bcd98641bdbf14ca2ab580457e19ad3c9400b5464ddb79507040f1a37245ed0"; } - { 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/130.0b2/linux-i686/pt-BR/firefox-130.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b62e837f2a504f804d9b09aaf98010d90080d1ff4747dfa9a992c72da3f82a18"; + sha256 = "2f60b71d956bc63232408d1db6c1b58462c3d1a6a64d86a93f39fc780b306222"; } - { 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/130.0b2/linux-i686/pt-PT/firefox-130.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "92abdcc28b0bf51eb3a8ab5e43dc9638f26e8692ed69470d97bf45fe5e31ff6a"; + sha256 = "c87088e69f7376d2ebe5637c0896558c3a4dec95771760679b30327de873e08e"; } - { 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/130.0b2/linux-i686/rm/firefox-130.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3588083df4f708ec937f7eda20da77249aa6fd1ef4e2f6fc86d785756c458da9"; + sha256 = "9aee04564277f022bc3426bdfe45b085b6eb853c6c2e5ee5c5e2cb883bc344cc"; } - { 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/130.0b2/linux-i686/ro/firefox-130.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "aefec65b1f06bcc23454621e55d9b44de1d3e13afcb170ceef40512f1f1ed7ea"; + sha256 = "178029778402b7b19be7e9bd1897e5c275a787f435afb1f9e0a570d532d570da"; } - { 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/130.0b2/linux-i686/ru/firefox-130.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4324d205829c7a697bd83695ac4b4d9b776989c4a5b904e809f67db6bc829f18"; + sha256 = "8529555dcfd9af32e5de36f2326800efc7963621b194a282be475ffad76d7f2f"; } - { 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/130.0b2/linux-i686/sat/firefox-130.0b2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "8556dd9b387da18fe3f3408a6df175d704d476967520cbb7899acfd79328f250"; + sha256 = "52337358efe5cff5deff16edec412691cb3b62ddea6d6f35661c5542db5525a4"; } - { 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/130.0b2/linux-i686/sc/firefox-130.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "34e9a7e8a81a2cff22e3e131ae1733c25ccba6563f5e42a25c790f2435ff4a89"; + sha256 = "5c68864c8ac5ff3b5301d94831c05e3036b6b92303f7b8401c79c253277335ed"; } - { 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/130.0b2/linux-i686/sco/firefox-130.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "6dbdeda295ca37758d4a531694e995f2bdaba4642ea004d58da0dba5492997ac"; + sha256 = "9f6b54d307c50959d249659454c1ddc062454ae5d5aa856fb5b98dc8669c8b00"; } - { 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/130.0b2/linux-i686/si/firefox-130.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c2ea2b2b67ecb74635cc6bf218f3f7cac739d1f98fce7c7b1e4941b8613e67dc"; + sha256 = "ec288ce839924f6b83521d27dad7ac867302200e37f21227877b48e0b1a287d1"; } - { 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/130.0b2/linux-i686/sk/firefox-130.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "9e59b962cccd43f5c600258df7719a7433367018c13637d1e84a09af4a05c60d"; + sha256 = "055ca55ee7af8534611ff7c8799f227e20a9de49e542fbd6db39c788cae39baf"; } - { 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/130.0b2/linux-i686/skr/firefox-130.0b2.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "1c1a1435a7ae19216a100a346737a60650ee1a25024b77dfef1a09c0fb3836bf"; + sha256 = "53be09ab8894f686cb4ed7b67757dd3dbcb0e77f5bd88261ddc066b812f01058"; } - { 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/130.0b2/linux-i686/sl/firefox-130.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9222bd4ff0b4c09b36a0e6cce1fa51ea7a9414651ff9f50c05d227347806ca0e"; + sha256 = "3bcd6e97fd77b83af25fc62506a7b87af109fc05f89a11d1938fc2310b52bc4d"; } - { 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/130.0b2/linux-i686/son/firefox-130.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8f326cd87ade070d719c78f5e9c25f75fc5b1e03256c8b27c296f0bcc62388b0"; + sha256 = "4a64ddcbde27c29d077e14e381688070489779671db187a77b5bbb27234b9aca"; } - { 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/130.0b2/linux-i686/sq/firefox-130.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6618c0d3414a61720606e1599387871ad3f872f12042a5c0117d6181608c2be1"; + sha256 = "07b74dd98812adbcd33e9478916de493d60653d6e956f97036cd84a8e501bfb8"; } - { 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/130.0b2/linux-i686/sr/firefox-130.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b2a6c5ce023552ea357c442591157b2293c298b96cb19a1d7638f10205c3426b"; + sha256 = "07c41f3ba21714f829803ccc358031236299d13a3ca8f3676594eaf8a60a8ad8"; } - { 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/130.0b2/linux-i686/sv-SE/firefox-130.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0a879700cee518c51853631bab1eda501833fcee87cba41603a3299897119f11"; + sha256 = "e615cde1fd77e8e051a95a9005ea1b3138ed702126e55b17b1aaf2ca25d22114"; } - { 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/130.0b2/linux-i686/szl/firefox-130.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "880e10a03b2feff02642a630c1a5c2d8d2ae7eddc2ac8a53337d63f925b62862"; + sha256 = "c8566fef15e8df33d5a6c3fd82b6f3d320651b9127c4438194c5d101c53c1bbf"; } - { 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/130.0b2/linux-i686/ta/firefox-130.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "077e3166898dffa838726a55ca2dad043c671a9c9d4aa75b6a6fd4854379dec7"; + sha256 = "f53506de3808de393a2b045544e4e6c8c031051ec856046f7fdd1fad7cd99a39"; } - { 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/130.0b2/linux-i686/te/firefox-130.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b6b17ac1598959b7e0aaaa18e3154d4328a31f520ebba7110fca44b7cc8b4a39"; + sha256 = "13fd47917d24b8627498c86ba61da650a54c5fd39367403389a539d391920df1"; } - { 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/130.0b2/linux-i686/tg/firefox-130.0b2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "3279b5bd1a1f3bc4d4ef1461fa9fd8b1132f8dff0cf6c385291b1329b3b5f962"; + sha256 = "ff13e7b1ed62c3445a90c152970cdc394ec1d86f8cc8aaa50403ecb1f7821107"; } - { 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/130.0b2/linux-i686/th/firefox-130.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9d6c24c604934c4162281799c11904cc17cb5e8295c5ed7484e6432ffc0d17e2"; + sha256 = "f28df2e27b0ea86352a8386f0a2d453f14bc59e67d964c9beb3ec66f0b0c4f02"; } - { 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/130.0b2/linux-i686/tl/firefox-130.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a5792ce6dcaa5bc002454700dc2abcbc6f9de580f0a70ec2919c9599e3858ac0"; + sha256 = "4d3151c06b1e5db4ecc1a28927fd9e50bde6d21353aea9f63726e6fa58334999"; } - { 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/130.0b2/linux-i686/tr/firefox-130.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "05685a83407f94e15c08a75aa46bf45bfdab1b2ae7626a078848b392586c05c7"; + sha256 = "fb3906732149fd6b6f71d45f8340efd74c3da4799acef2836d4b3cb650447d99"; } - { 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/130.0b2/linux-i686/trs/firefox-130.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d7f1cad2b4772ff42c954bf6f8eb78d8787f5aa86be1314cc4b56fcf261159f7"; + sha256 = "d2ab069435e335619927b0a29661a80f122be37393ff3c1728bb1f277f02e427"; } - { 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/130.0b2/linux-i686/uk/firefox-130.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "da0d0c57358ae2bbe196d06358a5f410f814eaad236fbaea1127d2131eb0d054"; + sha256 = "eb19793380a176998198429b824737eceec37a69dc468d7413a7912fb0100b7c"; } - { 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/130.0b2/linux-i686/ur/firefox-130.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ea70560d84141403a242c3a7fe4b0a50999bc5845a7a239291e1b2a27e0a0aa3"; + sha256 = "c59ae1e4267bafdb506c7dbb01ccb93523e9989f4676e6bf0925e175000086cf"; } - { 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/130.0b2/linux-i686/uz/firefox-130.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8578a45c8f97e3138a7109e8cd2969e036ef08e935ec1e530be823ec3de12d9f"; + sha256 = "a946abf1f36ae15f9b319095f718cbbb6d56dbde200a90bf85dd3d4db9078001"; } - { 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/130.0b2/linux-i686/vi/firefox-130.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6f77bfc640398d00b136dde75f72156d3f4025a916bf16063bc06dcb3e3e1529"; + sha256 = "c58b94c8b45e85be52938ffe1a1b4c00db66b7160dd062b64ba2ff3e392bb797"; } - { 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/130.0b2/linux-i686/xh/firefox-130.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "7f74a0f56e6746a105298de72143597f978f59873071a871748f33e54078f368"; + sha256 = "c99842bc5a03f77c5836c49bb081b5266a652225c5ee7a7444db30e50b52ac88"; } - { 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/130.0b2/linux-i686/zh-CN/firefox-130.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a6708b44fa15dff14ee33f4cc4bbb2e5e550f663d179ecf0e3e4e7d44fc68ef5"; + sha256 = "1585b4e404b2aedb7a03fde2dbe5dad54501951b85841e525658e4dd51a6ffec"; } - { 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/130.0b2/linux-i686/zh-TW/firefox-130.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "333605566d2c3aae9e411a7fefe08ae6f339ff91fbc6e84a0b3b166a19c5ba90"; + sha256 = "adc817b6659c40083bd091a9ef7524b3ac193c0b66ddecfedfb9cd1043e47a55"; } ]; } 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..6a965af33bf92 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 = "130.0b1"; 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/130.0b1/linux-x86_64/ach/firefox-130.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c90f792f6522e27ba1b104e77bc0826556f4ca1184a7b65ef02cb8900586f857"; + sha256 = "4ccecb8552ba8f6492394bde1603a93c0025fda13e85aa6a5a8af84262a50903"; } - { 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/130.0b1/linux-x86_64/af/firefox-130.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c7c7ea2b9ae48a867806679de41097ef4459e7d35eafc05e0c44f2bbf984c481"; + sha256 = "7168680b5a9bc94992a26d4de470b785e0f1e16fce266a211f300f052ded6642"; } - { 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/130.0b1/linux-x86_64/an/firefox-130.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8ce747dd2bfa52d02d2d2bc80df7cee6a0def973afc39d23724d4873c54e014e"; + sha256 = "54adb6e4a31db13f3428afc56f6c382152b5048f3620b88c30213c24c7e59e8b"; } - { 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/130.0b1/linux-x86_64/ar/firefox-130.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c344d960f8670aac4e45a2fd89f136763950d659cb24f16c9d21bbb096eff42"; + sha256 = "4e760b4fe58e0205ccede8e3ce110fa4e44f04e91bb913ddc0e05a254ce9fcf8"; } - { 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/130.0b1/linux-x86_64/ast/firefox-130.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d21fcb8e549cefae78d69196d8c415372baf6844d462d4398790b67dde313977"; + sha256 = "91af2f2bec5b2ffd4707a37c34e86183ae366218df0ff855850e8c12840cea89"; } - { 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/130.0b1/linux-x86_64/az/firefox-130.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "060539f7cbd3170d17ce0e0d5e2a0850223c27766392632d69a1dcf284b1d48d"; + sha256 = "f65494bc2609a56886234bd8fa2d803de84ca09246021b9720f835fff0823f7f"; } - { 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/130.0b1/linux-x86_64/be/firefox-130.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b287afc5502c0b6752b6fb2f9d179c135321ebc7af9fe73cf288256add2ccbee"; + sha256 = "96e249151bee4b445b75e852f7a2d54bba5f5ec6d5f3737203654f7cc76baf5a"; } - { 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/130.0b1/linux-x86_64/bg/firefox-130.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b9beca129129a7f271c5c0274e5923d24fb4704167fbe8d33273cd815d80fbf6"; + sha256 = "19448bc0567677d0b4fc0035ad8fb7f50c82d5a746a89700f8bdca55d76705ff"; } - { 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/130.0b1/linux-x86_64/bn/firefox-130.0b1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0d32e670d5fe67648eae6ae2656e930f0c39f3e9fbea13ecbd8d2b53ff244e3a"; + sha256 = "388551adb53061661b243617409de1c2efc3afa149ffc1c25f4cc71c371baf75"; } - { 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/130.0b1/linux-x86_64/br/firefox-130.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "603bc328de6ca1e265df6cb0c876a9eca355ddfa6cff1cdc9c315322422c5935"; + sha256 = "f4e8bbb90e4af55b92d962ec9a0bb7b38a1a78bc61588f30185edcef723648c0"; } - { 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/130.0b1/linux-x86_64/bs/firefox-130.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "78a67e705a9a1f8a5ee8321c7184bd9c15eba5e6d67b3e77bd52cc6339e230f8"; + sha256 = "f35c9f7dfa2833447803fa7f1632190c96d0b5ac2beafdd5d96335880c6738e0"; } - { 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/130.0b1/linux-x86_64/ca-valencia/firefox-130.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9f9739c31f56a42caab55be23946be49e90bce001ad9b633b286f23b791c8abe"; + sha256 = "29bd0df654df97129f52ef6e3501ae300cf8379a9b99d32c21e836fae98cee59"; } - { 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/130.0b1/linux-x86_64/ca/firefox-130.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6e3103a530a8916967e55e90edd0730497243183144715cbb0d604c63c1e7505"; + sha256 = "1e423be7d2a861bd5b09d268b02aefc1b420e0b37258aec00b0dd9aabedb84ce"; } - { 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/130.0b1/linux-x86_64/cak/firefox-130.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "60e6ba8337350b02097a637042516bc2c8bf5a95f23997ac41d89f875cde5af8"; + sha256 = "9596f36581a2da0fb705e769c4a42a4eae0c099dc3e2a6896767cebc285760e2"; } - { 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/130.0b1/linux-x86_64/cs/firefox-130.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8ac4c0042e24ce4bf079b0de43c8263d93b9be35be70cda2f1f037091cf808ad"; + sha256 = "dcaaa82f0a18ae5a4852b4779c4d42fcade7b154feed7d87714352e82bad2cb1"; } - { 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/130.0b1/linux-x86_64/cy/firefox-130.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3b89ba108fc6a0bcce9ab36eb392861cd8b3eed8466b5b68eb5d37c1f29aea5c"; + sha256 = "f0024d008dbd5d55ef655168d7ffe7d6740b2978ba8594ccf1c10db68252d216"; } - { 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/130.0b1/linux-x86_64/da/firefox-130.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "eca9420742f9d0522d82b5c9e0bfcba1dc9ff131c72c3fb8e37a34332b2123be"; + sha256 = "24ab76f9126ca760c25eb24c5419ac8fc5402009edc1d6eee3f962226f913c63"; } - { 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/130.0b1/linux-x86_64/de/firefox-130.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c411fcb204511dc6a2d381e2522722d9cd67262be71f9ceedc4207463c3425de"; + sha256 = "107ed50755bcd25ba3a0c3f314eeb3747cdefd621fdcd59a0d89f80b941dabdc"; } - { 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/130.0b1/linux-x86_64/dsb/firefox-130.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0b285d2c3aedb8a0c8b139ed453d45418394fd6fd02e5e15f9f495edc739a8ed"; + sha256 = "2ed2b4668f1aa3dd0b5db7b38fd5cf8dfe40a742bb58e537c9237788be7f991e"; } - { 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/130.0b1/linux-x86_64/el/firefox-130.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "227efe5a5c2939c896881298f97f7e0651b647c5c87362319dfb41ccc7c5565a"; + sha256 = "62cc57fafcf2e23c9ffaba181effb30933dfcf5db8154e337521ca96fd743948"; } - { 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/130.0b1/linux-x86_64/en-CA/firefox-130.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "acb1f56d76ac68c4b45c9580708c68917f3e318eb6685a8bede22c6adb2d5de5"; + sha256 = "58a996a29bcba0b5801cbcf8d6c9dde011dc798e8d900cfca33b2a6b45158b57"; } - { 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/130.0b1/linux-x86_64/en-GB/firefox-130.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d9d4692e153e08cc7a7caf04c119c072fc0cd37061efd1f21f0cef9480135c2b"; + sha256 = "a1960329948f238fc01b9a7559349bf4544b416123885358bef4ecae52f68979"; } - { 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/130.0b1/linux-x86_64/en-US/firefox-130.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0a8bde14893cff97e60303fd081103612d6121747cd6329040f7fbf7e8304a5f"; + sha256 = "9a777b891e18e90cb845870fd9f73a979b616e3f1e75a61509fabaee900fcd8e"; } - { 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/130.0b1/linux-x86_64/eo/firefox-130.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4376258e69edcf6a2a9eb6cdb5ad38c8eac5547daf894406cfc22c59729d6a37"; + sha256 = "26e2ec0ecfb75095e12b1b31aef725fd795466bcecbb8b215852c10593cbde4e"; } - { 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/130.0b1/linux-x86_64/es-AR/firefox-130.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9d194fb49e2ee6055b809c61d53aea877b9bdfe62ca2afcf57b564259253c46d"; + sha256 = "6ed99bfaa4655344ff910928c114aa172084adf09546b285be060c7cd767f067"; } - { 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/130.0b1/linux-x86_64/es-CL/firefox-130.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e6acdb9f6a4807b355187e4cbe06fd8b1def9e2315ae09b4e5a2d429f9512a83"; + sha256 = "2e67cfcca1f498ae424efda32dffeb23c9dc95f4d1f15cdecbfe5f33f3342ad7"; } - { 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/130.0b1/linux-x86_64/es-ES/firefox-130.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0511e68583e10f1a126a0a4db6d8f443e105d9dfcd21fb9d19d7f57b5300426"; + sha256 = "e881ad57fce8e5da0897ebadc418b6b398b09e6cd3d75f07a52b539a96baebcd"; } - { 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/130.0b1/linux-x86_64/es-MX/firefox-130.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3da7f89ee01e2a602a3975aaa51f4a0adb666f741b25a078e69611d92b68287c"; + sha256 = "f84a9f7f3fb98f8ad01517a9fb4213b7e8ceec01c936398cd92a011bd7be66fd"; } - { 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/130.0b1/linux-x86_64/et/firefox-130.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4895e2432c615b7a1bb573dfd82ed9788bed5b4d94af1877aaf923e9e87f09c5"; + sha256 = "eec820196c92a6bed0303c81c42d4ae48905ff65a463f322450a8d916b96ec2a"; } - { 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/130.0b1/linux-x86_64/eu/firefox-130.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2e315bfd1098bc3f45c0668241ee69124210a2f4c5b0cc1520e61de7ee74cc98"; + sha256 = "4e3ff26ce4699f19ca691acc12ac28f8fef54cf30b327393cba1b774b3a5d104"; } - { 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/130.0b1/linux-x86_64/fa/firefox-130.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bb36ca2cd19780b3435a0a12b544dddea820df9d71b0767f3b58721897275067"; + sha256 = "ae6accea8915c30c2f4c139aff6e4190aeeebd47018004954947cb21428a8ddf"; } - { 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/130.0b1/linux-x86_64/ff/firefox-130.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b4b11971a848044706f9a8e2f2cd96b9affcdd05ea3f0616a9754488ef27846d"; + sha256 = "1a6b85ab3cffbae14d3189f997a08548e414275f26474bbd41b6239b9b13260d"; } - { 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/130.0b1/linux-x86_64/fi/firefox-130.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "24e64273a0b29fa68ecb95e3a9fdf88a9b4fa6917441d7218c4a66d48e9e5724"; + sha256 = "15f04e7e9a45cc84c6c7b4a168e93b6acc73be6257ef78aaf10c7a6f1a3057a4"; } - { 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/130.0b1/linux-x86_64/fr/firefox-130.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "19ffdf60a868070f1bf887133643d7e7de62b3000f2d22b4140e0d1564b4f01d"; + sha256 = "7832e96f5582824a4e21ee9a7a0f06b1339e75f42861455637324fdd89c155a8"; } - { 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/130.0b1/linux-x86_64/fur/firefox-130.0b1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d73b3be736513b702ce22e0924e86166b1b479338aa8f26ee460e648a01f0307"; + sha256 = "2a08279d92f74020c8297c64d84006645b1620d69291f5ab483453c3d1702b32"; } - { 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/130.0b1/linux-x86_64/fy-NL/firefox-130.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8063ea3e08c6b495f3274c8b2937a3651ed2f788e6e32d503938b533582f9022"; + sha256 = "57812e76e8774f197c12369d6867d1015800421b2f18d2f14c661b88b9d10641"; } - { 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/130.0b1/linux-x86_64/ga-IE/firefox-130.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7603f6d03855709224d36f3516b265db2d01caf2c56669435f3c8f67df430a5f"; + sha256 = "84af075709c9e75428def68f26b02db64e64c3c8735120d550c1bf969b30b671"; } - { 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/130.0b1/linux-x86_64/gd/firefox-130.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fc84ae08d0d17ddafa879149eecf62fd9e22fa61f529a38345b49783fa093556"; + sha256 = "3ddc09cea21e6608a9da10cbdac090c711388f3c5979a845358d5b9855d74dcc"; } - { 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/130.0b1/linux-x86_64/gl/firefox-130.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba87ac94b237e7e1ac2817f1074c807d97fdbbfd34e7ab9c4f268826296636c8"; + sha256 = "5bd573cf00841e778c1e665199e9358e638c20dcea2b4e13893b1bc0a78cf710"; } - { 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/130.0b1/linux-x86_64/gn/firefox-130.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "47c1226cba2c9462c904307756ea9829bd7ced15669c9b479dd8db7f07a78ddc"; + sha256 = "badec2b01ff415d27dfbecb933fd3bf836a9c3e5bf1db86c033aadea013e7cbb"; } - { 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/130.0b1/linux-x86_64/gu-IN/firefox-130.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0cb12dffb0436b3bf2a1fd6047b710bc70fa53cb243892944990c6b802fc16a4"; + sha256 = "e680a1b197fac31fd1938584581bc35f37386e907d8fca7423ac20ca2e09b4bb"; } - { 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/130.0b1/linux-x86_64/he/firefox-130.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4762e1729f632e78040ecf6101b1d80e0733ea72bdb800081df4829447aca256"; + sha256 = "9ab24a255f2726157296a5ecd7f24ce8f874ca4c6a257aeac5aaa247e39731bd"; } - { 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/130.0b1/linux-x86_64/hi-IN/firefox-130.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "4fde18223d92ce6bbe5736daa20a44629aba864cf0dccde255fed72bd138f12b"; + sha256 = "ea4b8d7d7fb48868a04aeb7dd10dc2029044a24ddaadb7c8e65d6c3ef7a61f16"; } - { 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/130.0b1/linux-x86_64/hr/firefox-130.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "646fb42e3733cdd1236387b9a6a93709ce7c6439f1b9549194e09014e759c744"; + sha256 = "d18461dfb5dda517dad4878a38dca598b92937daf000930b2588ed69a2424614"; } - { 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/130.0b1/linux-x86_64/hsb/firefox-130.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b1b23002a706ffec926a51655332972c4a25fe3981fe085ac028419f72b8b67a"; + sha256 = "2bb2edbc14fd8b14adb0ed0f6374a119b20a61604e23166ffc4c6ed1b2522a58"; } - { 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/130.0b1/linux-x86_64/hu/firefox-130.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8e22776d798cabb7beb11198f57b2c482aa605159b0ba309d930a94a25253fe9"; + sha256 = "ceafc5a52c41ffbb90cd6ad42f4dc21d282d3e39ec4f1f179c7fa11c600cf544"; } - { 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/130.0b1/linux-x86_64/hy-AM/firefox-130.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c8270908cb4eb5b7affd11c1d760d858374f4faa0d6e9a53bc983e7ce8b6ba1b"; + sha256 = "a082f8a010d2425d775d19dceea1000beb40db3dc2d4bdc1de1b65d8e362fd21"; } - { 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/130.0b1/linux-x86_64/ia/firefox-130.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "daed408de1230aa6cca0d5ffec077eee5f4e744d862004c7e81f65161414069f"; + sha256 = "c42dc586d55eb59bda0d753b2ff11ad08d0465aed3dadc90acc59643c7953d61"; } - { 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/130.0b1/linux-x86_64/id/firefox-130.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f38562edee02f984d072117a86f2134ae232bdb4b2a352bbc1e362fcb67fec73"; + sha256 = "0c2312d9e182e7e5e3efea4788b1872ef04b62a86a29e376e685f64bd9549c83"; } - { 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/130.0b1/linux-x86_64/is/firefox-130.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c53a562a99e749ea51728361834ce867e84fcff89ec16e771e86124a091b5fe1"; + sha256 = "2ea4c1473f7e61d47607e809842a841c096c87743bf42b4d3972ba7923e27bee"; } - { 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/130.0b1/linux-x86_64/it/firefox-130.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "40b057389706897fafc685c9fb3444f7dffe09bf55393fc0f039224377280d78"; + sha256 = "19cd18eaeb9f25b756d1a6509888bf9a5c637850fb0376ff0e35b722022ef074"; } - { 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/130.0b1/linux-x86_64/ja/firefox-130.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f956f07837670d725d1549366df1c2cba96491b7419662a85658d789bb7b4443"; + sha256 = "dd8334dc1ffa8a00ba0e63616e290aeb088818bdc9a9ba1e1cff9eb57bb4571a"; } - { 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/130.0b1/linux-x86_64/ka/firefox-130.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "20126e640f5152688a9116b4a7a0295b53a04a29bcb5161d9cce7824de5e4d40"; + sha256 = "995c5886d46947c7a30bbaa150ad87f8cd3b21846596a6cc9291570a17cc907c"; } - { 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/130.0b1/linux-x86_64/kab/firefox-130.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "03ef7295fba8b50bbe2004da259660bf28d74d2cf3fa5d55d407639fd7e18da3"; + sha256 = "f478e8dbcb048c85f11678cc0cf42a58a338ce38e4930d0bb6751034a9399f88"; } - { 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/130.0b1/linux-x86_64/kk/firefox-130.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ce67136dcc37edf39c734d0ea74c1216defa9e127f0e2f87a4ef4e97db4cb7e6"; + sha256 = "5ac870ffbaff47a49af378defcfac1eec1c2d655151fea9d665495d15c2db5d1"; } - { 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/130.0b1/linux-x86_64/km/firefox-130.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2a40245ccd8c76f755ed2147ad6fd9cfebe16fcde38dd3431580802c9e65c9bd"; + sha256 = "dd592b6121fae6615d5210ea3dbd5319bbcf71edbe38686d680d1e18e7a67c0f"; } - { 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/130.0b1/linux-x86_64/kn/firefox-130.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8444c74edab27f66c24cda2acbd1068c3ae399b74a6a4806fcec73bfa4c5da80"; + sha256 = "472fee23be9f3e6654abc99a68332ef43e7997352952cc72a1aaa93a7adb9e50"; } - { 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/130.0b1/linux-x86_64/ko/firefox-130.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3457ee728c2fdd095864dc0db63241862de40a4797add713fae302ee04992c47"; + sha256 = "aa5103ae14e929275fadeae461711728ed6b27f99be1d26cb8eb0cc70b220466"; } - { 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/130.0b1/linux-x86_64/lij/firefox-130.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fffb5026f93d06012de8a5fd8ae8ba1c270490c3ba6208e6e6352193e6731252"; + sha256 = "dfcde91b0fff54bac2ba222fd7a1418ee9f5d0663503bb3189f8dd13dca5ee0b"; } - { 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/130.0b1/linux-x86_64/lt/firefox-130.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "efeefab433f8b1316b9ca44917b7970876117bedaf307aaaca3314012834e431"; + sha256 = "53a03331e66f3a42183f6457d97e1ac9a34dbe557d1e6c75f5a6c40fb4313e43"; } - { 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/130.0b1/linux-x86_64/lv/firefox-130.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "03da80d47d995cd7e1a2168bfadaa33da7e7906bf181030d69dded6658e78180"; + sha256 = "dbb0e108095ece117cce9d6dc6428a6060551c16aab625366b7a34425752ec97"; } - { 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/130.0b1/linux-x86_64/mk/firefox-130.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "09df6b9e332dacd722943b1b59c33197881712ad1b3031b14eca2448598b43e0"; + sha256 = "3061ae0bdf84dfbc4ce4137bdb70179c7d96e394a46fddce698d3c5626241224"; } - { 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/130.0b1/linux-x86_64/mr/firefox-130.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ba823b31499aa6704e0625ca4ec0697019fce1da5ccfb1623c7aa4008375bdf9"; + sha256 = "d3497c833a5ad1624175a2d5101d76b981f7934e565301f13897ef1a57b27a45"; } - { 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/130.0b1/linux-x86_64/ms/firefox-130.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e2c56799d0e3d05559f83e1f158857420035ba019d35d01c6e3f826b084fc0c7"; + sha256 = "c7d8a92aa4044b3011b8163e011d2360c688e3090ddcde682e081facf5415d7f"; } - { 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/130.0b1/linux-x86_64/my/firefox-130.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7f375265916ba71f118deea04ef45f9630e63c66a5c37a5f0523ac732ede2472"; + sha256 = "2ea314216e599167876e3154ad296b36c96e71a7708ddf37b01f55e1ea0c5d0d"; } - { 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/130.0b1/linux-x86_64/nb-NO/firefox-130.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "315c1b0a5fe50831e25e696ed88301b2ee1021c87c253c807d9f80487b918f98"; + sha256 = "3e5e84a753c421ab9f8d44d424d7a15a18ff9c9270af6e82185ed886bb38f8c0"; } - { 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/130.0b1/linux-x86_64/ne-NP/firefox-130.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "64ff1ed8a9a6af9e2380984627a32462714930c57ec407a10232972749c09e92"; + sha256 = "e90e933de24961fc2e34fe0adf0f363a5182497a7cfec8b6f4ea6cf851f0bf45"; } - { 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/130.0b1/linux-x86_64/nl/firefox-130.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "74f41cd79775efcc9e46f302cc4deca589873ccec79793da327fcb6795d29b73"; + sha256 = "206b36f8e85931d34582e4f6f830673ca84a423eccbdae745ca5dd251b361492"; } - { 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/130.0b1/linux-x86_64/nn-NO/firefox-130.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "384475fbec200477f7fcac6f50ee6ced939a655874dccf97e7fe06dbdd17b040"; + sha256 = "3b26ad7c5159a9170dc35f93f53ae6b6dc43eaef31d39b18b5975d827bb97090"; } - { 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/130.0b1/linux-x86_64/oc/firefox-130.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a35de74c3dbc0393d8ef16b26b385029aef7455e8a5086076f44cb6de184b225"; + sha256 = "a4ae3157bbd6e553a5b3d288c9b649477aa5687a30b899f6b6e575ec6a603556"; } - { 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/130.0b1/linux-x86_64/pa-IN/firefox-130.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5a7440fc60c97646c5be3d54325a1186bfbc76e0240c5952478fedc315e990d6"; + sha256 = "53ce7fe5517dd47a4af0609423dc4cf2450172d6673529eff40ce27628993459"; } - { 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/130.0b1/linux-x86_64/pl/firefox-130.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d9c32935c78163ae3515a25600050b5b36dca71fe3725f9c750f7a42257a0e0a"; + sha256 = "a6802d656a1e5cfdcad62fdf62546128bd5a49065af7669122494c2814d9feeb"; } - { 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/130.0b1/linux-x86_64/pt-BR/firefox-130.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2753107d60854f1d5fcbb2f5b9e9851ea63715530251e10a22c3d3c2dfcfe78c"; + sha256 = "a524bb5160d93ee2ce2c5310ad6634692463055179f401213bd267c6cd52a7d8"; } - { 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/130.0b1/linux-x86_64/pt-PT/firefox-130.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b244e5453043f6090dcfaf9065938ce94da523b5bd6101127236027ccbd24165"; + sha256 = "74b1118c4e0950a21cab972627b8d3228aad1bd0d18113b95104a7f233db0ee4"; } - { 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/130.0b1/linux-x86_64/rm/firefox-130.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "38e59a74daa2384b15ff052b711f93986072413b78553e578861ba468ed05baa"; + sha256 = "8042959c793d80810395f16036b7a100c7bacdb8c6cd0d6d8d63c5f9c220cdf1"; } - { 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/130.0b1/linux-x86_64/ro/firefox-130.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c6ebb19d78728bc4da1a3f5ad1815fa476125ec56be3d52a2181aca3c563cea0"; + sha256 = "361e5dc269cf6f832ff7ddb662596c9636fad739155b092aab5e63c875a99c5d"; } - { 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/130.0b1/linux-x86_64/ru/firefox-130.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5fbede90845e1e9b7174f20df05dad0b50d3b5d7cacb94f9639910de0f2e7a12"; + sha256 = "a90c203d8c6fe22fcec036387df020f2a4fb888c7fb8e2fc636a11d5c9990271"; } - { 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/130.0b1/linux-x86_64/sat/firefox-130.0b1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "ca311eac3bca2a02c7e8f66ba964f5015c548d2a287969dbea93b0fdee567641"; + sha256 = "83c94ae84536feb2a13a2bb7447eb3fd72dfebfd7c434787bfff84cc71294687"; } - { 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/130.0b1/linux-x86_64/sc/firefox-130.0b1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "f34fa641a957195bb73c1f4168801e020fa9be368fc77eafed6dc8c6254a5fdf"; + sha256 = "ee477331d67d4b464f57871faa3a503433c3113aa0bdf6b23ea3a22ee6247799"; } - { 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/130.0b1/linux-x86_64/sco/firefox-130.0b1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "22a9b137f752267d7f08faa8256832dc16a6599d7036d8134dbf0bebed625ec5"; + sha256 = "0aa3ee7d77dfec73ff8e1509c56b416f0dfbd64dccb66805699044b5646569fc"; } - { 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/130.0b1/linux-x86_64/si/firefox-130.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1f692a1632c70e61077b8520d1caaf2adb2460d7350befb342fe14dde45b30a5"; + sha256 = "a8303d4b8e9700df53b6be50bc54f6404d21cf818ab8e895e6b128cec04ea1cb"; } - { 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/130.0b1/linux-x86_64/sk/firefox-130.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ed469631fa261e6839bd7fb41934a0ecb694bb5e5cb8e745f567ff6b9d3a09c1"; + sha256 = "134e3395eb331363dcfa378a87078119e2b8b178359fad2f3461772ef3518957"; } - { 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/130.0b1/linux-x86_64/skr/firefox-130.0b1.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "29f93b1c9852ee969207cb38ed9caa773866b69a8309fdd9d67680e6bfb824db"; + sha256 = "f1ae26302af1e8f990e39c3b6b7733e9d8d3c4014fc76b72b90968e15d859fbb"; } - { 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/130.0b1/linux-x86_64/sl/firefox-130.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4f5e98d7d6c1d68a9aea0673492b2440e7dcc9b2b6d502e94c5ec5ab10d2d244"; + sha256 = "a6af520f8fa209cd1b60427e21f70aa392f3c5662daaf0b514f2768605e068fc"; } - { 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/130.0b1/linux-x86_64/son/firefox-130.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f042cf22fe86e3b3a4d23884c6ddea3a8ff08bbb24f7295cc618f0ebea8dbde2"; + sha256 = "eba1248e75921771811b85a2fd88109f36409ecaafc10c9edd35756cbd440483"; } - { 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/130.0b1/linux-x86_64/sq/firefox-130.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c8908b4df6a785f968a3ee3a5d1605f37c54954cb8badb10dceac3a5412db6f1"; + sha256 = "cd15e8fd7dfce26af9c537773bf02cd7507db7f2fc67bba0d214da4eb4459cef"; } - { 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/130.0b1/linux-x86_64/sr/firefox-130.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c4788512b4c5695dfcb020c897a81817b14a32c3132115dc840c9ebe8c19e016"; + sha256 = "670885196eee681f517f6931c936faa9ba8b651718a228d22b650987cc4349e9"; } - { 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/130.0b1/linux-x86_64/sv-SE/firefox-130.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b7851e5104fce808dac901788e0da55b7c513a8cf544bc5917513139d5b7b63e"; + sha256 = "bb4172d0643b702d0c9ff92387aca850782e9acde940ef06f148bdc079a55f83"; } - { 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/130.0b1/linux-x86_64/szl/firefox-130.0b1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ab4a5b7ebf094ffd9b58a5c86fe67fa5ec46d8ff835531b105fcdb4714269572"; + sha256 = "85c0e53718dbdff4548a677c6244c3f5b4da0bbd79a94e31b107b95a6deb121a"; } - { 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/130.0b1/linux-x86_64/ta/firefox-130.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a572ea53f4fe7f69bc6e87260bb790be0a5dcf95ce1f163443e1e6b0acfb6386"; + sha256 = "844a0fce109450a899c24b04afd3af145d6a6645d9090ed76dfd99d78381aa8e"; } - { 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/130.0b1/linux-x86_64/te/firefox-130.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c8b75f3840bdd7171b09972294a2c3f0d65fa6fa409acf70e261c071d0a46b46"; + sha256 = "80a7f2908e5d057520bb11c559860b42cbe39ce12773530baa7daa4fc569ac33"; } - { 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/130.0b1/linux-x86_64/tg/firefox-130.0b1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "076bc82bedd5839d2adb544fb46c8896785453adb9ad28e930db4e649ea057b3"; + sha256 = "4ce8be0090c428b7d3108c68c333196fd356433f7185092c5bd813cfe33b6767"; } - { 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/130.0b1/linux-x86_64/th/firefox-130.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b50a958a94de094ae9b68f69a6cfdafaa1404befb8651d8ec642a5725d61349d"; + sha256 = "87af15e98c7a795cef963e75a6d40062b234727b1a9f666cb37bcdc37e335ca7"; } - { 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/130.0b1/linux-x86_64/tl/firefox-130.0b1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f65155bde32d3b2ccdb68fac209bae375d07912c299273a7d24aca62f5d7cd74"; + sha256 = "2e597f14b93265c415b089cc749aa8d8b942970280ae6fb971de8fd337eff43b"; } - { 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/130.0b1/linux-x86_64/tr/firefox-130.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "17e0d6b2ff623ff8abee10e13aec566b6fc8135b7e87ba6012c8f53f661c1436"; + sha256 = "b3cbc4de01e112a2e040cdf0b8e943c9e7fb256ae824b547aef4236be70d8e63"; } - { 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/130.0b1/linux-x86_64/trs/firefox-130.0b1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c10d567b9d315df88df4b75f27baf0a5338418ec64747f9d9ba12916a2847839"; + sha256 = "9bbfdea26263b3d50b8202be32c65eccc1e954dde54b9eb49df76f27b2ac7b77"; } - { 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/130.0b1/linux-x86_64/uk/firefox-130.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cffff196e1ec88c2bed876b47d370a2d02dcfb305ddb6774f24ada40c3b2045c"; + sha256 = "75298b6f22c1be8d4dcca9023e6e4cd385093fdc4767114fa7c1db2e69e62c03"; } - { 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/130.0b1/linux-x86_64/ur/firefox-130.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "4a7ef86a445f717838b0ac24e3f7e453785d2d36e955c007e79065e3dbb11c0c"; + sha256 = "25854fedc5d46be7e73e5836a33d30d77fe8deb822cde1579cb40c76caf59ad4"; } - { 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/130.0b1/linux-x86_64/uz/firefox-130.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "793b0393fbbde9b03cc48f4b67470e9238941f890ce109a4e2f6dee7c4ce9285"; + sha256 = "b5cd50ff7b221454cf1d9fcaf31daca328d3faed5391bea4b3ffce52b29fd365"; } - { 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/130.0b1/linux-x86_64/vi/firefox-130.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6c471538a27c9587e0015f214a53a35fd308758f468bb3dcf8398a826b2019f1"; + sha256 = "1e098609ac94c1a7e6bd184759ec424d5ba71b5a3a3b232c83271620d7175bc3"; } - { 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/130.0b1/linux-x86_64/xh/firefox-130.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e7c602469379c7337ec29a41da891c2d603c30e7e2f5d1027b362dfdd818b00f"; + sha256 = "348d30f1bb4172c041e74eb6d5ac83fb117109ce68e534f5953356a6c8d26a8d"; } - { 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/130.0b1/linux-x86_64/zh-CN/firefox-130.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9dec174d1c885a3e9e3b3aaecd64ab6e63c3111787c62338d58bbdafa447345f"; + sha256 = "ca28cc17a589d2a1ca0188c348de35d4659e073bfc2a3090413d8c7ec389ab32"; } - { 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/130.0b1/linux-x86_64/zh-TW/firefox-130.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ba8d50d3fed019c9e800812e80cc32ace24776c5a07abcfc7d6c2c5829fed857"; + sha256 = "3a89e82d1fac35c09abf5b003b046c2c69739a51fd5b4c2663ebc4e282876e3c"; } - { 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/130.0b1/linux-i686/ach/firefox-130.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b5378932b59e633e838873c1fde0b7f08cf1f5ce9bab4b93bc8d82a7c3338806"; + sha256 = "561e04b52014577e36f3dd39f3d9d6db878de30d07878efcc74195243a5aca24"; } - { 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/130.0b1/linux-i686/af/firefox-130.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d8fe6fe723921447d9d1ae68c6cf403e6ce4673e7f7918a48f1bcaf3c575893d"; + sha256 = "123adcced00a44d8db77905bf3002c2e64e81ebb72fc09824507846e0c3d31f8"; } - { 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/130.0b1/linux-i686/an/firefox-130.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "cc1aa23852f5ce598eaab6af0b041cbc39d87959508c8e300e6bfb49f3a6a6cd"; + sha256 = "4439a0c911282708bb9707f8ca1449558687b839752067f63d81bdde920e4117"; } - { 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/130.0b1/linux-i686/ar/firefox-130.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "abe568b67dd04fb2d44527ff24c76a3cd3993071160f0f2a18dfcf5bfba15250"; + sha256 = "55949846e3f1b8c54219fe89eac651b8974f10001b692096809288934cd92cf1"; } - { 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/130.0b1/linux-i686/ast/firefox-130.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e7d422c3fc62fc80d60aa9ea492b5713065cc646a3499b27f67549abbbe7c9ae"; + sha256 = "46a8da2111fb6a200092294aaa23cd25ba2a8a61c839257d8a550883ad46b847"; } - { 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/130.0b1/linux-i686/az/firefox-130.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4bdde11382946be34fb0693024deb49762fbd80bbe52e0b3aa79231642a02512"; + sha256 = "7448b098967fae02e24b405ad6521717444105a0303a2490d710b37338c1220d"; } - { 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/130.0b1/linux-i686/be/firefox-130.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9c4b8814876dce2d7104ff0c14a22cd147435144cdacb30629237c3e20eb1038"; + sha256 = "e729ba84291d6f354e2b989f23e90916b4fc68dedffe7a470e9ac27a3f7f8e3a"; } - { 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/130.0b1/linux-i686/bg/firefox-130.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "06292b301d1aa4c5785796f9785e30a3659b7a4219e02ebba4bf1870823d6f0b"; + sha256 = "eb46f4c2df9eb32b3af502848969874e27f88b007396cb4429862071e4578df0"; } - { 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/130.0b1/linux-i686/bn/firefox-130.0b1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0f918d2b4e26c49a725792ffe01f8e1bdf9b3960ba1e2cf6b304c00937984536"; + sha256 = "6736dfe391bf9045ef956c07109d11b27116cfa8bce89e989004537bd55a8cce"; } - { 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/130.0b1/linux-i686/br/firefox-130.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "cec99e4f2f0a2b111637e0d8fadd0aacb400727bbccef462d16db0f4805ad971"; + sha256 = "4bc4f065a86fe1f582ea1aa7c115c18e077d2981c1d796a48f65ec437e53b958"; } - { 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/130.0b1/linux-i686/bs/firefox-130.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0cacc56ee3d17220a3327639de3e107c4e8e574c94fdc8da29ca6770dfdaf7a4"; + sha256 = "5274bd0bb0b9f587efa04400e10b1ab4f5540811da75895472e2722045254b5e"; } - { 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/130.0b1/linux-i686/ca-valencia/firefox-130.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "afed8d6c7751af833cbba0f12e548bedcae1ccf5a3ced5d551db56d79866b1ef"; + sha256 = "355a8f0088909edefdbe8b66c5435df6b29dc54541f238b5783771a8f56c717e"; } - { 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/130.0b1/linux-i686/ca/firefox-130.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1b3b89346b66eb2126ee628b68f3fa3fba8c625ac333ae87a6482176f867dd71"; + sha256 = "da2a408a1a6d96d717dbe3afc5c4332bf8d80461b1f4b9dd3e9a44b659acaaf1"; } - { 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/130.0b1/linux-i686/cak/firefox-130.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a78c2e9799efb987cf44a4ceee61933432f9979bfdd82fce0de373cf016fe37b"; + sha256 = "19ee9df4c37c6580c308730296058da604cbd0f4382b43aceb892bfc55097e2b"; } - { 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/130.0b1/linux-i686/cs/firefox-130.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bfa3ad2a4778ff6ab52ab7eba6f5219dcc6f7311fd466c68940d92779774467d"; + sha256 = "b25d41a26ac23aad3d5fa9f0867c1ff97edb1624a452c8fb064a9419389f0e6c"; } - { 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/130.0b1/linux-i686/cy/firefox-130.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7682e913a6bba419cebf21de044dea7c3fe4e2187529d5523373bc1cfb0c7956"; + sha256 = "7737bd95f2a6a350bb774493b9330f123ffe3e599da980c14276e5137d0bcfa0"; } - { 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/130.0b1/linux-i686/da/firefox-130.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d133d535195a293dd3a63162d479086ecc451104f62090e2cfd439f590d75fa9"; + sha256 = "3af49a1e1a17db90a340202d9c79a052796dcaa5076bb4ab6580fe65fa550118"; } - { 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/130.0b1/linux-i686/de/firefox-130.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4b186c5e4e5a6c32ee7f71b25ad68c75973739c1e10541cb79131940efe3fdeb"; + sha256 = "e5e8f3eb6583742f1641b48ca55f690744c07fe2ed318e40f1f21102c6ec5b33"; } - { 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/130.0b1/linux-i686/dsb/firefox-130.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "96e9a434fa9ad495a0e337683fd2988177843e3b7d59458d19f0a97a758fd00b"; + sha256 = "7b93e8982b404f033a55d9d6ffb7e7ac6ba996ddbce48257962472ee52863392"; } - { 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/130.0b1/linux-i686/el/firefox-130.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "76fed2fe453f5f85185e84c5fab08f46b47e097865a43004bb2dc6a4b43c64f5"; + sha256 = "cc93ae82147e2fa8251eddcfc78c357b2a852754f80306f4188b69bbb0ba8481"; } - { 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/130.0b1/linux-i686/en-CA/firefox-130.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9d7f2c2c4db876c164e1c95d33011cf2e1d09550d6df43fa58fa3c9fc1619981"; + sha256 = "73eb1fcfdb54877a4fe22fd352f59404cfe9ff3a945f53a8d3633a7b48e0b566"; } - { 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/130.0b1/linux-i686/en-GB/firefox-130.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b433bbd479360ac9624722ec70f1e97fa0d5e25f955244dc5bf03b4fe4554239"; + sha256 = "deeba102b79396ca8e7befd29334b238d3bcde499d2e174bb55d2569ec811bad"; } - { 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/130.0b1/linux-i686/en-US/firefox-130.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "631469743fed440b332af0d16d806795cff7f30b3e7265b2eac98d4bf98db2a8"; + sha256 = "9c892bc7e7ec72b75a93baccf468fa8aa686cf65c47e37c0f0c1a3ee1dec131c"; } - { 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/130.0b1/linux-i686/eo/firefox-130.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cfab9b835f572713b767dfc89327c0371da38fe5106843d88e9b012baf0afb29"; + sha256 = "c6c77226d01d2aa79d3f6df8ec8362cdc0d8feb040062eff4bdc273722ce08b9"; } - { 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/130.0b1/linux-i686/es-AR/firefox-130.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e0e8c77819aace0322f1fa36a57dde503c19a7104a9660f7179b9cd9ae8f1262"; + sha256 = "58313b20de1e59b69b6aa5b0e7553d559eda4e6da98f8d47c2dfe2816cf49513"; } - { 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/130.0b1/linux-i686/es-CL/firefox-130.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7a58a042a064184a4146da4e29b8063d0a588b64699be180f8e061752bf3c4ee"; + sha256 = "f1886d1c7fffa1af221d60f0d17519ac56c8e0eb07c997c2186d6bc954572d3d"; } - { 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/130.0b1/linux-i686/es-ES/firefox-130.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "90f55ac2c19aadbed48cc9b8f475896b5bcc3527ed27b5dc75a57e00a1b1eff6"; + sha256 = "d99eaf17220619c5ba4da3d1d8f9a37ddfa14e1962de71afb6a1c545897825df"; } - { 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/130.0b1/linux-i686/es-MX/firefox-130.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fdf59175bccb34442af1cb5f50a6c2c1e8621523922e6e6a438377f797b8dafa"; + sha256 = "c9fa8a1481a55c8e5aff49be5357041e79838b8b3c81faca6412a98f7000689a"; } - { 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/130.0b1/linux-i686/et/firefox-130.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b81f13c82bc73367d51155a03bb2b81712a62192785ded86796788578e3ff681"; + sha256 = "6d289b4125763da87a1be7740530d6bdf6c2486f6726efecc46ffbca2d729546"; } - { 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/130.0b1/linux-i686/eu/firefox-130.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f5edb24a1ad14037ea08d778050f8da3b825bdb8d8a76f57e278acf54a10a5b9"; + sha256 = "f34db9d5d99c4122a0471fd1f424b3d77b22d5b08577b88245588b9f7db72288"; } - { 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/130.0b1/linux-i686/fa/firefox-130.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ae33ddc1a4d1ac5837fb138f0b56eb83a4b185eec8417bf19dcba5e1238a21a8"; + sha256 = "9a6a91d149e53b01506d0d375e2865112dc0358b737f02330b5ccaf0e231fbb2"; } - { 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/130.0b1/linux-i686/ff/firefox-130.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6f76ddfe3379324650e32452df1f7407a3105ce02bae6ade173a51cf1d478046"; + sha256 = "87a0835d3470aca820a14af75366e654daff81cce32d1918b03bb0f057bc033f"; } - { 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/130.0b1/linux-i686/fi/firefox-130.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cdc69c23e92616147d43eaf29aec2e5df0079e8721cab027f9651ab34abe2988"; + sha256 = "d6e7c93e1e95937425048e48c9cecffb7bfc6da627b1f59686ea737c85c73dc2"; } - { 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/130.0b1/linux-i686/fr/firefox-130.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "aeea885a3243c723f0b1cc21e991c8505e2d1aafa58ae0c9bfe1123d24a95ead"; + sha256 = "41edeb0e1ca1e8ed7784c798daf1abc7f6790bda4069b8f002f931fc728518ca"; } - { 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/130.0b1/linux-i686/fur/firefox-130.0b1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "85537ea245f24b25b110ea968eae5ac6f72605d3bcfd43a445e97410b729925b"; + sha256 = "344c943b8194cfa027f22b06bf8a213c73f4a5e368a480a07a1e16b594373f81"; } - { 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/130.0b1/linux-i686/fy-NL/firefox-130.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e007bd725f02de520b5371cfe8056f11ff037b9b5e49525a649087b9f5e8dd6f"; + sha256 = "247d0b2bbe93923b01ff14ee9e5cb73f44c56d5bf5dea50712536aa929ffff6c"; } - { 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/130.0b1/linux-i686/ga-IE/firefox-130.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "32e1fbe009bac79b7fed9125291e9550608328cf9edf2c4ce652d2e762027670"; + sha256 = "b8e373045e01731093e4d5717690763bcee9ed6a8714e6bc3d3033874e601b09"; } - { 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/130.0b1/linux-i686/gd/firefox-130.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1e90d4d5a6236e31fa76ed773760bab8f76d3ad9a13ca89b77c67fe62f367c9d"; + sha256 = "ec58ed432aa0b194a7e7cb85d41efca9ad94c0850ceb1f7a6fe24d549940f064"; } - { 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/130.0b1/linux-i686/gl/firefox-130.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "55472c87702c35df3b6511b364ea64eaaea628483d8c214dc2299ee9159148bf"; + sha256 = "ae559cba902b33e49fc8c942694ef50cdb8807a36a12f20ef828ccfef7f2bf38"; } - { 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/130.0b1/linux-i686/gn/firefox-130.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c30bbc39d3c99f5b5b66f8e91afb91e6c4539658da8a0bed1e025acb26329c9a"; + sha256 = "99ef7e9f97af819961b8e5c1900aa025b8a7c934097fbe1404c5f3575fd3349e"; } - { 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/130.0b1/linux-i686/gu-IN/firefox-130.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9000f9f5501bfcca41e1b76207e559bf160485ecd1370b559d471b1883f06b30"; + sha256 = "2a8a9b2fc372b30e901da9813d4bcc040240de7a8a8aa46d630b3b7d7b4f2d5f"; } - { 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/130.0b1/linux-i686/he/firefox-130.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1a579627acf37865e1e354c8e2bdbd5222ab3add1a18bd79a869ea237380855d"; + sha256 = "44813dc94fc1a945bb728df6cdae20339e070b13e28b1e0fe9b58aa42cf1b7b2"; } - { 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/130.0b1/linux-i686/hi-IN/firefox-130.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "06e2f8449087b8466739ae2c1e3623d7e6424f7b49a4feb77e4696336079e871"; + sha256 = "d4d7532dedb95fc63647da923a76d45e2a1292ffe24314ecd3b06976cc031c4d"; } - { 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/130.0b1/linux-i686/hr/firefox-130.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fb4bcfa65aa2c4e250109f98ec2da08270910707d1ce3c150ef5d125ce84731c"; + sha256 = "c034c08715196022574c43d1820c8e4fb0b34f5ac1957d37ac8e726fcbd7b1c9"; } - { 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/130.0b1/linux-i686/hsb/firefox-130.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ecec8874f29c42691e991e0e35f29bbdf52e66f63a7eadcd1d14904ff97019ec"; + sha256 = "a14985957672e13335354cd8f5b28d113f5ac5a52c487da9929f5d0787b71e97"; } - { 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/130.0b1/linux-i686/hu/firefox-130.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "097fa497377efd34cafb30fbf7bf309f0ad70f6b37d6ffd1e0ab12e8534747c3"; + sha256 = "9bf3a8b5f9ad0ce143cca7a9ebf6a8e6a5ecadaa4e4b9bd09c7aff0f6a0178b7"; } - { 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/130.0b1/linux-i686/hy-AM/firefox-130.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8d721e9f622eaa2e34a6a1e371e27a8a5f52fc14006124e7f1c04ed4ef061bf8"; + sha256 = "dd806959c1f599cd629e7a9179f20b79f2cace536028c8ccc2507cf9d376e54d"; } - { 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/130.0b1/linux-i686/ia/firefox-130.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e080b7c91a3d14218dacdcfacac95a8e69688e84215110b313dd6b4f9103bb34"; + sha256 = "cab60ce8fe36fe8f0ae259c74f4a212eb77395e856bcbc5647081685f70f8028"; } - { 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/130.0b1/linux-i686/id/firefox-130.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a895763ae3b2376bc7d6475832d6b5a3c7fd489f69714e44c654cc6f1b020689"; + sha256 = "cba2e4f6d63c467637504e720ede4f43fbbd6497ffa1c535f67428dca0b73d26"; } - { 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/130.0b1/linux-i686/is/firefox-130.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b924d52d0f875d11a5fdb82014d1f3bd6f4dacf59991fab768e3870ebb7d7e15"; + sha256 = "f45d9321d1db35d56a7431a049c5ee94ff105d08c11351afc38b826f972a9157"; } - { 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/130.0b1/linux-i686/it/firefox-130.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5af7bb832f155cd3932fa41407befc15842da3c4faf69740e364a5299683a67f"; + sha256 = "17b35a50d1d3268217493b39a24054ec6982590c1788ea3515f2c73041676cb3"; } - { 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/130.0b1/linux-i686/ja/firefox-130.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ab2abf989843d52fbc958922d607e7107928f19aa8e346717e7b0afe0e8c041d"; + sha256 = "7bf9e5470c8b3f89712b2f5bd20178800c1dec6cbbe8d33287a237f7cf695436"; } - { 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/130.0b1/linux-i686/ka/firefox-130.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f281e820191256a778e60b99e3ab21ee0c6a001d19dfdf66f0997d66ae2068a7"; + sha256 = "07370c1fe13fa04363947b4a252850edc0a82687590409097a8ee53222e9d2d6"; } - { 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/130.0b1/linux-i686/kab/firefox-130.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e7f36ddf2bfba93f0eaea2091f9d19059e469dfb6392059e25c94f3ca6b76c13"; + sha256 = "bc5dfa3b137edf5a1d10ed4dd29854979fe323c63c794908bb20691883d60102"; } - { 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/130.0b1/linux-i686/kk/firefox-130.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5b950ddcbd0b0d1d35ccfe513fa75c97c4f03c9492f284aaccb8448913975f17"; + sha256 = "67cec51b24d979d7ef20deb37dc56fa127adcfee1c80b711e8e20e5dd8470244"; } - { 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/130.0b1/linux-i686/km/firefox-130.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ed151e02a9e6023584b039c563eaaf5687a0cce2e524d112fd8d0b842ddc5edd"; + sha256 = "09d9f140c07666c8526eceb2dd5c39043f6f402b97801a36ae0fc74ec485217f"; } - { 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/130.0b1/linux-i686/kn/firefox-130.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4eba588e48a099b017525b53fc999a0bbd4414e61299e2bd91c4bc451eeefeec"; + sha256 = "6c6f557ef338b3b3ae4d771f93b331200ed2d959adf35631c0364d7daa900c1f"; } - { 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/130.0b1/linux-i686/ko/firefox-130.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b2ae712b38398a1b8c3fd8174a4ae76901f419c4610ab85d9dafbfc92a1e233e"; + sha256 = "5f7397f0864694427826021ea4055f1cfa5ea6080e346e3d8550b6738261cb8c"; } - { 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/130.0b1/linux-i686/lij/firefox-130.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7bd8e5afe6e8bef9ee917a16c0014153944baad3d4df07604dc67ea21ac2b065"; + sha256 = "59c4b8baaf621d0433452a2cd372f6b829ac3fb4d2833fe3d73dfdf32a47cd2d"; } - { 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/130.0b1/linux-i686/lt/firefox-130.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f9aafb27d854e8ae6eb6e2ff85cf7d14320fa7e2aaca5836be0e7a09dd4df415"; + sha256 = "07f25f2c44e2f93ee06766ba2f210bcc2179e12191a9bfe32af312166fb0f12e"; } - { 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/130.0b1/linux-i686/lv/firefox-130.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0b0d7e0837f0d9e3f0e9f628df717500079850a69e065f4a6cd3771975b96c59"; + sha256 = "46423386a9445e97ccfed77297e9c6c6ad16857490cb3768651aa489d441e8ef"; } - { 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/130.0b1/linux-i686/mk/firefox-130.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3541015f658ad5275ea503708f4a4daefa66742a011eed36d943ba49e377b278"; + sha256 = "9d4f301a027f67db9ef053bf3d855bfe206f394f619e38b3274d75b88e94e26f"; } - { 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/130.0b1/linux-i686/mr/firefox-130.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d8cd2c6d7be07c0a0d7686917c2c16f4d7620392616d985405aefac36880d68d"; + sha256 = "2d7a494542aa3f327bd1001369b254066070e2dc6b03c376d5a6632706ad3603"; } - { 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/130.0b1/linux-i686/ms/firefox-130.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0150da21fec66c1da911d1968ff281a97c2d7421b7c3e423066f091bd040c357"; + sha256 = "638f1f047034e6d1de5fbfed8b817bd0e69a3f3f4d2316db11cbe18e45433167"; } - { 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/130.0b1/linux-i686/my/firefox-130.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0fe17f9023928bbf8845aa476b27513954380e8096fe7cb206be9633cfa3cf19"; + sha256 = "4d89706df692ba3e6a8c2054ae126eaca81776c88c5aba595a478debbbd31545"; } - { 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/130.0b1/linux-i686/nb-NO/firefox-130.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4010fb76776bebf6037ce0788946e6098a7bface36c1281f14a7d9a69acb1be1"; + sha256 = "1c266190c63734c56d15c551b60cb0cefc043fbd783d264843539ef16e28ea8f"; } - { 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/130.0b1/linux-i686/ne-NP/firefox-130.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "675cf87d896a9441e3f8ee2bb72853fb261a552766dc49f3422d04c537ab0485"; + sha256 = "cce96577d8067807659faff06dd092555055a6de34c9f30af673f544d1f1679b"; } - { 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/130.0b1/linux-i686/nl/firefox-130.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "28caebb6df719979af3cab55730b5b0445b6d855667e06dd235725263aa8c5bd"; + sha256 = "329676aeb12761430305c91ffa1ebc2d6d8b43362614c0b19b5b3f88fe0b5565"; } - { 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/130.0b1/linux-i686/nn-NO/firefox-130.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "31ece43a2f1810d7bed9130bd7ca5f81d8b35781bce1555a10f3c80c4a1b562b"; + sha256 = "3673f86f77f068569c59668fb122edd148259451c670534aac72c6b54ebbf93c"; } - { 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/130.0b1/linux-i686/oc/firefox-130.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "51c81489325ceb3f17fb48a493247eadc977f53aa82809fbf46240b582d04e3a"; + sha256 = "9348d1e6aeb211e8b0ade1946f4db3a21d4c2e30fdac82d227e84ef5db9ad2c1"; } - { 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/130.0b1/linux-i686/pa-IN/firefox-130.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2cb5df6e97c3dfbecee309380b61438c2dd8c1101eed829d72e81a2b3e6d1e83"; + sha256 = "6b056e31a62395b234af43f7702c2d389183b8b1aed63da24545f60386dda6be"; } - { 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/130.0b1/linux-i686/pl/firefox-130.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ab03983056df8b9f86369d60fed694f62d8435913bdd4c9263056744be1f25bb"; + sha256 = "d7d63aa143364f2d928714b7e8eca30e8f9b87eb9ed9db134155df7916eaebba"; } - { 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/130.0b1/linux-i686/pt-BR/firefox-130.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cbdd4c98cb163b2f2855d6a9d1044ea58c011bfa635c0dae366e864b4faae805"; + sha256 = "cc987d54edb004419c76516f662f417e03d99b349e801bfc4e2e08ef7cf2e431"; } - { 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/130.0b1/linux-i686/pt-PT/firefox-130.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7aea218fe428795abe12d23cf1c5253aeab4382c5bdfbec0ca575e2045ef46ed"; + sha256 = "f312722b8452b23e2ca136a2842457780c852b8504d7cb415d90ae509519993f"; } - { 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/130.0b1/linux-i686/rm/firefox-130.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "6d62a4552a59300f4c72c418a6fd386ca89ff8eb2cd43a10b01271a168c057db"; + sha256 = "49b95d29028ae302266a5a7a2b84e30d0a061d54d14216c23efdf1829732075d"; } - { 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/130.0b1/linux-i686/ro/firefox-130.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "11bd2b72830e876895ba9a53d804641cae08f4ac1c0691f5b75bd8c50627576d"; + sha256 = "faebd4b93a64bdfa756b62040b357c063d36eba741b1834c957dd961ee0fbba3"; } - { 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/130.0b1/linux-i686/ru/firefox-130.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8eb355d2482252bb668dccda8afe3ec4e9416f0ce8b1a7d1bc0b3b1e614bb53d"; + sha256 = "fade024a51148bff2792f841404abb9ce1fb0949645375d3027bed0258630c4f"; } - { 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/130.0b1/linux-i686/sat/firefox-130.0b1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "56fdfd81f33a17897831e6fbc960ee72b6d4bc5ccdbe0f499bb7040c467d5c98"; + sha256 = "13d551fdce796151c0fb40365dc2105b8a10d14280b86e4d8f2e9754cfe6e461"; } - { 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/130.0b1/linux-i686/sc/firefox-130.0b1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "79f9d2dac687d4ebe5c3d89fc142e0fabbb744fe13968e81014e12687f54482c"; + sha256 = "099e7ab9d9427dcba819e0f212e56fa5a90dfe270ebc1cac8da589e01d206b89"; } - { 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/130.0b1/linux-i686/sco/firefox-130.0b1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "f9676a196a76a269aad93d9960759ff179e21fbacac3957117010fd231b4c49d"; + sha256 = "04b7487c43f863e075dfc3bd5ade2f9109e27eb5d19064cca8a9339b32a5899e"; } - { 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/130.0b1/linux-i686/si/firefox-130.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4c0e4ca10911b46888b1f88ed8922375354c2d6ad549023f7f5150752ef61f68"; + sha256 = "691b14f134a16f6401be76ea7c68dd30df6a5ae2602339bc99fd429aae945ae9"; } - { 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/130.0b1/linux-i686/sk/firefox-130.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "643cfa0f3c65ff2051aadd235042fafd52c5b10ef32d4be79c76e1b02da62bfb"; + sha256 = "69f850cae0490029bb3a7fca59b14533abfd9ff66e66d48bcc831eab7c2056eb"; } - { 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/130.0b1/linux-i686/skr/firefox-130.0b1.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "e8a80a7d5dae201e4590ad644dbd9add83a1c4bcf8f592165c6dc87765f17361"; + sha256 = "c84efe19a0f5190877f6f1653f8f3731f20f64c01bfacfcc800c0503e70a1510"; } - { 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/130.0b1/linux-i686/sl/firefox-130.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "32ab4d5e6df6095aa80184b92fce6bfbe575bd3ebb4c2f9200519c31b67db6c0"; + sha256 = "be183e734ae1fa6825af8f26ce30173f5d3605e8b42857d52f150be6f56a831e"; } - { 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/130.0b1/linux-i686/son/firefox-130.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "edf2f00e87e992121721fb2b948637650845169dce0a2f98c708489c8f6f0fb2"; + sha256 = "f68a5e04ee1daf0507dcb1e714e70e19841d7f218900954e8cd032788ba6c7c7"; } - { 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/130.0b1/linux-i686/sq/firefox-130.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2317f12916cb73037322c9e8c350b4fb2b1f1e9f035337eb4dd7c6acff35ec95"; + sha256 = "6c54bc95fb5af62a1710fbd15a8886f67faae9c8727859b932dec89875e9d0b1"; } - { 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/130.0b1/linux-i686/sr/firefox-130.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "660fe43de82ddd20b7e8ee3090cebd02c3a78a6b42693be19599fc818662c08a"; + sha256 = "03d47ae24aa0fd6b41632954bb37fe09e5343b3110e260d368d8f4ce89fe7bda"; } - { 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/130.0b1/linux-i686/sv-SE/firefox-130.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1479aaba440418cd9763e1b7a7b6c10c05871c69c27a9d5bcbf19c5956eeffb2"; + sha256 = "c2401a90085d1ad9fe724a38d254ada92ee75304c9583bb51684e7bc877e8c35"; } - { 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/130.0b1/linux-i686/szl/firefox-130.0b1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "f0b7b11b448222416e7f8ab46e658727060dedd2fa4114a857800cc6750aefde"; + sha256 = "3b4cc1b8f60e83439eb9c89f9ba4f437a8b70e506ba8a936f1d823ce8f5802a9"; } - { 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/130.0b1/linux-i686/ta/firefox-130.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f8bb68b199e450945ef262ee364ed6677998f24242e196d04d45b0209469d96e"; + sha256 = "f1ff1861a706b8cbadcccdceb25a3c13f5659da250c4906aaffa6e9c4984608c"; } - { 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/130.0b1/linux-i686/te/firefox-130.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "14db538c4ce10af0c635f7ad05447b104b35d5b8aa2504331b1e3a388b2bb6f2"; + sha256 = "7b12691fda152b98a2a63d5dcf43dc96ee3ba34a71fc072fbd897dd4c5c39c9c"; } - { 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/130.0b1/linux-i686/tg/firefox-130.0b1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "32035ea4399a294509a939501f5cf8d5e9e5bdac24662fd6e5054adddafe843f"; + sha256 = "bf4264dc07465718ea41624931f7c66d55df6ff63e03bba16339fd856e1364e9"; } - { 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/130.0b1/linux-i686/th/firefox-130.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b09e831b65829f63325354bdaa0aa40097a035bedcdf8890464f2cfba1b4bd86"; + sha256 = "edc411d0f4aa56167a97e7479938ab51afc5972cbcd8a7e054d8ad5ffb84a809"; } - { 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/130.0b1/linux-i686/tl/firefox-130.0b1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a7d024c484ab97f4138d6468a60ad0aea86427ba955db0522fd3c93d89becac4"; + sha256 = "d4abff8bad155849edc7dfcd6c9c28460112d25ca275b76c1fd111415fa7e995"; } - { 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/130.0b1/linux-i686/tr/firefox-130.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "95ea9fe51952c17f66171420e42daf69653f50586e50f52794df20ed6dc294f3"; + sha256 = "4433a8dfd9d16dac3611f4ba30f1dfe0eb96ec9597f39290d195ee1bfc30709f"; } - { 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/130.0b1/linux-i686/trs/firefox-130.0b1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "727afcc04a981d7a29c97ea2776a519817d69deea0c90a2e692169a1aa363af4"; + sha256 = "b8bd992f47643889bd780c748b4ec010bffe0d9ea6701bb4fd0d1a0e72594cfe"; } - { 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/130.0b1/linux-i686/uk/firefox-130.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e23ab0495d135ce16f959c06e5eb497c6589b3398c2b9971d94513feb65b54b1"; + sha256 = "d0488062e63b54fa5ac9ebd7aeeaf56d1079fcb9a66b16a6c68aef07dba0ee15"; } - { 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/130.0b1/linux-i686/ur/firefox-130.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d7f3a250bdc65e5bd15bac830025d62dadff4f889505abe9778998136b675c3e"; + sha256 = "0e1ff4663269e1db7018e9fa8addae438857876530e3daa53b7f910b04f7dc25"; } - { 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/130.0b1/linux-i686/uz/firefox-130.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "23422bf0985202b1e64435f1202b81b0a5f11e5c4bd3dd206fa124b3c2ae5aeb"; + sha256 = "6fb6e39c2acbb00688d604afc945c2a3e9e700ef5a3cadd677984756cce5668a"; } - { 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/130.0b1/linux-i686/vi/firefox-130.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a2fe9e8d70e8251e88280cc741292b830d10ed8144713d3a0ea1874e6871927b"; + sha256 = "a8447e2984650639e8eead6b05f572a4644455d10d6fd5e0e886b848c487b31b"; } - { 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/130.0b1/linux-i686/xh/firefox-130.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d1a06a53bc6f3676fdd0a8f45730209c2bae1bf5729da35b0347197183b9aaca"; + sha256 = "bf44273b0c636b961089d5ad9bbed1cf2dafc7c5811b6edcdbaf3289b02ad46a"; } - { 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/130.0b1/linux-i686/zh-CN/firefox-130.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c3c41c73da2ce5bbdc237d53cde700899ea070d4614e2a7eb3c23aff38ba6e83"; + sha256 = "883b00705c041c3654d2912ce49f025f50d053a8eded82438092ba9f8506e081"; } - { 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/130.0b1/linux-i686/zh-TW/firefox-130.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9500a28218045d816828becc5f5b77cda638145e6c3e2e08f848d673d8e77ff0"; + sha256 = "62381634104d71a5705349fa21933da827fa0ebf185722ef59692c22044672e5"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 7aa9e82430b9c..262411142d602 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 = "129.0"; 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/129.0/linux-x86_64/ach/firefox-129.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4dfae5ad421dd82245663acde11aa82f10fbd073f45729c9c026bb67864f5158"; + sha256 = "1d934e0221a82c858f5e9dc25b125a7467ed6304d398dd631a37ff767b04c074"; } - { 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/129.0/linux-x86_64/af/firefox-129.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b3b74ee172d8692d0f6e2a09df097f360c726e66687479b5629e5f3825ec59a2"; + sha256 = "2906ed5e04aeb3a6cfc5bc0d962face417a53c65e4c2b48cd5425fe0c7ac29d8"; } - { 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/129.0/linux-x86_64/an/firefox-129.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "36f54f2a806593130608a24ad46269045410a64f6b0f03a626c5493d9ef45c5c"; + sha256 = "dcf22d66de52c312669f26efc702ae0f8411c2a560a7ad47efb6662fc07467b5"; } - { 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/129.0/linux-x86_64/ar/firefox-129.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "19a33b4b6d2c9628d9f46a3ea54ad265524be6734c5b4941c3b10ee54905bd2c"; + sha256 = "359fd04b8368c74e33231a452e91873d75b8bf339f04231b2fedd7a7f74a77c2"; } - { 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/129.0/linux-x86_64/ast/firefox-129.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4f38bae88ccdf64c6b01006b89a28f59ac4b4cd56a1bf4a9652de96618cbdf7a"; + sha256 = "195d033270e483b930f1b133f74ccb2e531cda5955c6a709e724abbae901dd45"; } - { 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/129.0/linux-x86_64/az/firefox-129.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "dd27539fca8bb7f96bcf3e427d0ce24d4e4c0e85f480ee3d88582edfb9f87e9e"; + sha256 = "1dde4c2338f6434326a5b85880e6b5a2c90c20f9c3725581c67724d7e6d98677"; } - { 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/129.0/linux-x86_64/be/firefox-129.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "edade0529527a7244d35952cd0a321e55da0df7bd5f0ed9abfe420381a15c60a"; + sha256 = "1674d8fdbc7ea750ed38e36958107d884fad993b44462939511c2952082480de"; } - { 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/129.0/linux-x86_64/bg/firefox-129.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2878112dad9743ed79df6412c1504ce2df74815bf6a94f3e3d7e8e82fe5661b9"; + sha256 = "8476bd9a484fdd57391d7767097870ba821f0cdd0d6dcfd188db0ebb8c132641"; } - { 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/129.0/linux-x86_64/bn/firefox-129.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a6ea19219ee6aaf02aa5957a91a9687f5775fbf8b560457bc36bb27e58251e90"; + sha256 = "bf0906579ec828dc89267b262de9721d720b2a53d130d45daca578b8d4269ba2"; } - { 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/129.0/linux-x86_64/br/firefox-129.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c98bd781a092e33e223322b5f1b758c96cf6ef2560ce6738a14004701266715c"; + sha256 = "5cb061e2553c1fc54ed46cd52afef14b823fd70a101d6b37d2db462179a6b797"; } - { 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/129.0/linux-x86_64/bs/firefox-129.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0082d6d4004ab6aaf0a212b2aaab5e71a199296b718f2cd854b019d775505cd0"; + sha256 = "1d9064e5fb2911f694a2a3afde65a41757efe0481570b8766e9bc74f512cc25d"; } - { 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/129.0/linux-x86_64/ca-valencia/firefox-129.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f3344a8ec525b945d2d28f7cca7c85b0259a3c74913ae3fca92b4ac3956e6386"; + sha256 = "7a319a9e807ef5d1c74978e374a2ef2a7ec5485220bf08ed6a7dfd9511f0c94e"; } - { 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/129.0/linux-x86_64/ca/firefox-129.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d001c54e02d9ad4f050b0b278a06c21f407f3b2857b5d9857d98effcbc565254"; + sha256 = "4590c4384d3c808032170a78f25ed569a5412c46d41f27e57a205bffb8251780"; } - { 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/129.0/linux-x86_64/cak/firefox-129.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cd9192d363f75d01e91198e8b3099118551865a09acfce3bf3b3faa3d10271c2"; + sha256 = "a5d2257c779928daace655271d430b924ce0116e88ddab3be998085b1926118f"; } - { 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/129.0/linux-x86_64/cs/firefox-129.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d9c1318224e2cff169a91c149d31365e1b4d1281373aa7fa2b580e7c96d416cf"; + sha256 = "89f58cb6add83e7ec049dae7cf82242ba01ad54365d14cfac3e3f3f86273666e"; } - { 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/129.0/linux-x86_64/cy/firefox-129.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "88f4f8f626f9506af309b7330e51354de96e0cdae323f140a5ed2585ce0bb64f"; + sha256 = "7b350b402c04bf3d28d336e7f7e9be34eef69556eb09f8662416915b93759fb5"; } - { 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/129.0/linux-x86_64/da/firefox-129.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8dce8aaa01be56cf2862c3aff05fb36bbff26ef6ac6d879499385df57c0fb1ef"; + sha256 = "3f53f317e4bea75a474e9d5d64fa4af00a0cdf8ada7966d85a08176f0aa8ec94"; } - { 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/129.0/linux-x86_64/de/firefox-129.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ec9a45975a649a2bf851b2e28cb36098a5df28fc4ef6bd78ec576e25b6b56148"; + sha256 = "1f35a8ddd3f9cc241cd5e40e26c48f52e88a9453730aa8a0152e958609cda493"; } - { 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/129.0/linux-x86_64/dsb/firefox-129.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8a633651937fcd2370d1b92414d92f40e7bc3b24d8b5fe706a1bfcf0dd7ab784"; + sha256 = "86eb6e67f931acc6075532614538aacf01295718486fcf6b0bdbd02bc0d71df6"; } - { 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/129.0/linux-x86_64/el/firefox-129.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ae236ab979107d8872473ace4e0613f348aa6e253d7f9ecc3324151ae8b0d68c"; + sha256 = "29cb4905ccfef1b12b63c6c38ccffbfb17c5e9409135a9249e6de294d883ede1"; } - { 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/129.0/linux-x86_64/en-CA/firefox-129.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1a0b556ee830faf468424a9ae4f6674ca9d3c7e543a8a96645add085f6cd973a"; + sha256 = "c6c81d6a3ed63c8537f0d749e222af66476b6e1f167efe34d0dcedc5d701ba6e"; } - { 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/129.0/linux-x86_64/en-GB/firefox-129.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dc0b55ddf32c5ac9dddf252099f76befbd8ca5155e734299187857a5fb18fadc"; + sha256 = "cdd360b6b55d1c3a634d2a329df2d21ee9bdef31b4094ad67814625d8ddc5ec5"; } - { 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/129.0/linux-x86_64/en-US/firefox-129.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9e200146236e2403d4be088b49a6c8de3294ff1aa000ebf385d42c593207954b"; + sha256 = "878a042f49ee34314bde9ca70a0f93c0941c247c72f17b87d904024bef2b27ad"; } - { 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/129.0/linux-x86_64/eo/firefox-129.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c50d34862367350aa694ac8b5ad97873db38f3fb8a2350c7b509cee85d90f417"; + sha256 = "4582f392342feeb9273e11bb054115cd6fa789d44d6cbc077870fef4e28d353d"; } - { 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/129.0/linux-x86_64/es-AR/firefox-129.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "10f171448d215525df0bfce6032ae1526e1386307c563c672c333421b9a602e7"; + sha256 = "07a7dd9551fe0ffbff63bf3b3e0cf855bba1135114a4b67eb6d50e3e66cc7c3d"; } - { 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/129.0/linux-x86_64/es-CL/firefox-129.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d9e56e9b814df519e169bb238d8777a56aa6564b21688f9a6cdeedf1196471"; + sha256 = "b382e96c08424874ed427267412ff5a1ae58864098fe568d3ec8819c0ffcddbe"; } - { 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/129.0/linux-x86_64/es-ES/firefox-129.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2ce2327cd3fee48bc33b04f142fcf208aa4bf1fe5a3153e5516b28d6a8d09822"; + sha256 = "bb3004e77d60286998f444b057bd8955366017044c29fdc518b3f12c6e46c463"; } - { 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/129.0/linux-x86_64/es-MX/firefox-129.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8c28e006fd14a56c64c56c1582495dfaa50059d339a2ffecc8f026e85cd473ae"; + sha256 = "fd6ed1ec315e2b19e1a14251e1eba2758889888ff390b8cf50f975892343c5a8"; } - { 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/129.0/linux-x86_64/et/firefox-129.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1cde2e22e944213cf66f81b339a07bf6b51934597c95839e7b1fe9177c0eaf05"; + sha256 = "cfb5a0c99743369bbb4f6dd20080eddc2587c93bdc6b5a4312b017f7ee3a3467"; } - { 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/129.0/linux-x86_64/eu/firefox-129.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a2963d61444576b3ec18af5c0562d1348049e86e0419d046bb9d08ea17e5d463"; + sha256 = "3e5c01efed205c84631ec32cd0cf32cc06aff550b667d49476195bf99381cc32"; } - { 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/129.0/linux-x86_64/fa/firefox-129.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9d3a3d49c64f9c71b504d8ddfb7134dbca5e4be516c4918a93e6fc27b23d0c3c"; + sha256 = "6c016c6958f31af24817e2fbedde879c1b2d9bc31df0f5eff039925441d98a4b"; } - { 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/129.0/linux-x86_64/ff/firefox-129.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "63b1e31fc5eb80156ce506069e34c8cb746ef0fd9e862372b70af51f84b96a88"; + sha256 = "32f3384c3334cad52db48173c888a7cd7f05ad61c06715708d771fa0d685d3f7"; } - { 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/129.0/linux-x86_64/fi/firefox-129.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0dc5a2af7f7b5232172f35ab830c50e922f03faeb1d145811d3dcfd929ff207f"; + sha256 = "0ef3215cecf49351608622835d09b4bde02482a2d8e67ce03ba8f5e93a97c599"; } - { 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/129.0/linux-x86_64/fr/firefox-129.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "774d6d7377e8681fbf41098d4b97c8b2a6fa5733a16e82fa30281ca910c9158b"; + sha256 = "3983a9187b9d275cee935e2ed25fcfe9492e70e5009bfd6e966a262e6906ed57"; } - { 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/129.0/linux-x86_64/fur/firefox-129.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "cc6f207e654aabbf98b62eb35037b382faef0f20a0579900c294dcd04d8e672c"; + sha256 = "e36c698d2797b9a8c346f8c808be86a4e5f8cdf35c176d6da4aea8e8613919aa"; } - { 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/129.0/linux-x86_64/fy-NL/firefox-129.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bee7bb15e83fcbd301814c6fa5af00e981ff411ce8f5e54d7f7ca1e0ac702b7a"; + sha256 = "f5abad706ad435b68e74a93b035a054691fcd2466604e44aa0ba95da11ae326b"; } - { 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/129.0/linux-x86_64/ga-IE/firefox-129.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "84d2a4286f25871773c77ed74644e88a7a32c03fa65102d583727a9a63442c57"; + sha256 = "9bb3912a4f3c8389b407084cd64ae163b893ae3836eea73257bd3fef2d13b178"; } - { 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/129.0/linux-x86_64/gd/firefox-129.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f42aef7cf706b73b0e4f9228513b9d5c6f0e94416facabf16d516e41980fe4ce"; + sha256 = "3b9d45ba4a4d3fad4b9bdb8e6a9a84e3c671406df46f2146d4a5be4634b94068"; } - { 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/129.0/linux-x86_64/gl/firefox-129.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9ef6d0ab0f038d61a0eebf6306522705b86657b0e453c3883a3ff282ed0ecdd9"; + sha256 = "2f57aee4ed568a70a2d16eedd6dc5c82d1833d8d3ec9a2b0c5f03a1566f2a89d"; } - { 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/129.0/linux-x86_64/gn/firefox-129.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "74a1933f6a3e32aa7bc5ddcf7cf6cb8a6d213f251bd996413db26e30136d0ef2"; + sha256 = "c3a6794657b5cbfdc8b1ba8230483279b3d8e8e5ecff4481bc9dcb8a002e90df"; } - { 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/129.0/linux-x86_64/gu-IN/firefox-129.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "5be06369f5db552e0e74b8533c0d594695d0e9b1beb2a13e882085981c2f734a"; + sha256 = "4c5ee7707994ed1d938608ed5bdeb9ec59fc2d8d3cdb35a43796b3f250e3d430"; } - { 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/129.0/linux-x86_64/he/firefox-129.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6f02e9268fdcc0c328279df1113cd886fb640ac14f883d46500542284beea134"; + sha256 = "e4d043a5ff8a41e6140f76446387c6142c8948a2bb338e6bdf389535bab3c257"; } - { 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/129.0/linux-x86_64/hi-IN/firefox-129.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a1530fd469d553ed332f685d5688efac2a5766039f42a889475333b13f05d016"; + sha256 = "ca8c0df2d201e54c7cf88e9d865f69edf35d3ebe6835263ed2d163442dc3687e"; } - { 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/129.0/linux-x86_64/hr/firefox-129.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "60ab0be6f32c8c27336eaa1d40e92f750381a527178ae3ca98540b5f1fc39b2b"; + sha256 = "4132ccb85975c194e8af088f559b7a196b275c2ab97e72cfb59f7cab0e8c8f65"; } - { 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/129.0/linux-x86_64/hsb/firefox-129.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5dd37ab66bd3aeb0aa82eb0f92ec82b24f15e3ef418b5b03d5c57846b9657f71"; + sha256 = "a0a79d81e3c5728ae3c4a11c8744594e44365e35c6cd953b66970f5ea051190e"; } - { 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/129.0/linux-x86_64/hu/firefox-129.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "97ff3ab5dd865c4f550bfb710212083df39d82c47a053d603bf75022a9f1ff2b"; + sha256 = "4da787ae003383c85000100907fdd3f5be9b2718f0dc13c874c41c17cc2bf86b"; } - { 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/129.0/linux-x86_64/hy-AM/firefox-129.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c13f704a3231f35ef4944c5140a6ed89b2b88638a61c92a76d6460bf167a38ed"; + sha256 = "27c9e318817ec2151f8f1d32e6a4d289d230c9377581b3f802fd7745308e8c39"; } - { 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/129.0/linux-x86_64/ia/firefox-129.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a70dfaf92b39fc33dffc8f5c95b62c2783ff5c68d10e04c1f37dceb372b9aaf8"; + sha256 = "a4fb5ecb6c20639c6ebd63f64e03954a34c8f6a8e9464598d60c5508e95bbbb2"; } - { 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/129.0/linux-x86_64/id/firefox-129.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "507c9b6d80def4fa180c666f9da7c7910b954d794a2b8ee56cef160cd1bd1092"; + sha256 = "4d41958bc7b6ab08f6159b5e6a102c93f22e79451d32dff0f047da5719155e99"; } - { 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/129.0/linux-x86_64/is/firefox-129.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3c12b24d32d1629dad830575a391be0518e3f44940173760527827328d402059"; + sha256 = "449b02ba198717974c29366bcd75d1c6dc612a07f4d14ee75b7ac2fb83a5e168"; } - { 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/129.0/linux-x86_64/it/firefox-129.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7b3fc208e75079e2f01de115f613db7e96d2e5f4122eeeee63db2f022eed60e9"; + sha256 = "d2167eae29da1fd05ec159b38e65b639289394944cbb399e567fad518eafa233"; } - { 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/129.0/linux-x86_64/ja/firefox-129.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "881e83cdf8effeb5e9f27f64c0ceebd522e56041d34ca3786a2801641dbbd3fc"; + sha256 = "bee814b2f8fcd6ea9a6228b9d7679e512257052ac5e3a79c706e3ee47054341a"; } - { 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/129.0/linux-x86_64/ka/firefox-129.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "edafa57a48cd4b1935e851701c8b197adf601b50d6514edc9e6b41f390bf13f2"; + sha256 = "dd8d5202c622039a3753070b4b21646e49f54aa157024b125281aa69d4e17e65"; } - { 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/129.0/linux-x86_64/kab/firefox-129.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0735d2b6243f167f61ec272b2cdf4ee0c3bb2b176ed184d54f48233946d2e4e6"; + sha256 = "184800a76bdc5049f9596d17e162af9c18e512f8fb2f01ffb1e2cd853cf7747c"; } - { 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/129.0/linux-x86_64/kk/firefox-129.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e54e825997ae813d6fe2cea24ca19513d40e332dc5d8b95b86777caf95ca5d80"; + sha256 = "9bf544baf6e87c267949505ff4ff798ddaa12da96f391ea5f30775053b1200a1"; } - { 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/129.0/linux-x86_64/km/firefox-129.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "43f2fa9985241a9b1472804af44c7719166dc122ecc42ea5ba34846a1564bc71"; + sha256 = "2f55249a02c872ecdbb5b89b16079c553784e1154f93be7d407c343d21091150"; } - { 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/129.0/linux-x86_64/kn/firefox-129.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ced0e62b4055403d0b78c36ab01d9a5242b627aa9132f5028d8ca756270dc65f"; + sha256 = "1a6f05037348f4b2d73b7b88e01826c40244c9ac76acf1ca586a6bb100f46c68"; } - { 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/129.0/linux-x86_64/ko/firefox-129.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c645c840d9a7c1ae65ee52b3639b850ca461acd6cfed6935257a11868572e42e"; + sha256 = "c326bc97d38e85fc9fc9d8ce0f431c55a848de8bb636f4487effafcfb225eeff"; } - { 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/129.0/linux-x86_64/lij/firefox-129.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "328ca467ce2bfa6fa8c3d21c4c2c44853cd2def892cdbde309fdc49121868d78"; + sha256 = "fe73f48208063888ea05dde58e7157927417002a36f02deb698035abfbecc026"; } - { 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/129.0/linux-x86_64/lt/firefox-129.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6e7d5279c77f91f4c0cb2e47b74dea071f0f80d7fc23453a1aeeb06e3b2d2990"; + sha256 = "5c0d5510265e0afd39a964fde0a2f6fb486cb306e919b7db92bf4043dda008fe"; } - { 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/129.0/linux-x86_64/lv/firefox-129.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ff1baf65721034c4f0fbcc85b4de21f30abb696dc4bd42c379183abaf2d7ce8c"; + sha256 = "5dbeaeefa43652c0da3930f6b2f1197173359956f79e53506f19f41dcdee0e5a"; } - { 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/129.0/linux-x86_64/mk/firefox-129.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "256dcd6ee20c4b979b62060115d37123da404566a0bd2a2e676fb1e9533358e2"; + sha256 = "1aa348aa581db0440299a5cb4080c40769345ebb7d982a0072bf622842276044"; } - { 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/129.0/linux-x86_64/mr/firefox-129.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "084480eb31de920f8188a3eb0543322760924128c34b7667ed442bedf0c1b47d"; + sha256 = "e279c839b6af927455b72ae0913696d3926c977a75a145c43e1eacfafbc04d71"; } - { 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/129.0/linux-x86_64/ms/firefox-129.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4e8aaecd56f83c7d611ebb91f3693f4aae8a8d39ba6bb8b5e096eab1e18b923f"; + sha256 = "bf76b3466490708b0d4700e0e000c3ceede39987b36cd40b40d0df63766b8a35"; } - { 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/129.0/linux-x86_64/my/firefox-129.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5d5a9dea125a06fda41111ac750e6e80483ec69d2db035b38bf449a1e8a964ed"; + sha256 = "ebf7ec6d854ae2a9f2a41d5ae14e6c8b604a792ee14bc612582712cb7a220c52"; } - { 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/129.0/linux-x86_64/nb-NO/firefox-129.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6c6c20020c2e7163ba5f164ac5a65ac7a39c636921a5104702e59b228773bd41"; + sha256 = "7ce04af3019a5d9b9d5df9f591f3dc3e6a46bdf78c51a31dc08609d36a49437f"; } - { 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/129.0/linux-x86_64/ne-NP/firefox-129.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "64a0476a467475606d93b01776c5f312203f2c890a1c46e57200db97fd2bade1"; + sha256 = "11502bae6b8dc8c9cb720167d66726142c8835a5047f9874be41d98e832db592"; } - { 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/129.0/linux-x86_64/nl/firefox-129.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ac9a3d91a2c990040e9087eb2efc1162bd63f0d75b2932c0db7acf81d059f898"; + sha256 = "ed799249d7df9730660c4ebbf729867fbe820a400fd7aec2c77e03af3465246b"; } - { 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/129.0/linux-x86_64/nn-NO/firefox-129.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "beca6cbf60ef413d5467a6cdd934fd338c510d9d350919acd6b86fe7fdd21df2"; + sha256 = "bc0aae7ca4c9231fd81a002727404b7d4f92227e4ec6d2a8efb51668103b5049"; } - { 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/129.0/linux-x86_64/oc/firefox-129.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c3b69394a0bf611f95a046f474a0bbd1a31f59bb57f1ffc7752a82e61a856240"; + sha256 = "6ae87a8838d6e08b5c6a161d665495f2c4ba138eae93337d7b1e525bdbe86628"; } - { 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/129.0/linux-x86_64/pa-IN/firefox-129.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ce6a5d86485002aafdde6e8d5b77683b595dce9b20e07bc0525cd3f508e3b516"; + sha256 = "f12347b89660faaca24394ee48494bc3726406f73534f56bba302062dffa46e4"; } - { 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/129.0/linux-x86_64/pl/firefox-129.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "773b984d1b091ddc839c2f1d123723be38a759e12536f874bbbdc1bb4e54dc2c"; + sha256 = "e91b05ac187174c6d7c9021a104de4edbfb1ab6e886a64bd5562d7e37d8c461a"; } - { 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/129.0/linux-x86_64/pt-BR/firefox-129.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d84e766c36fe3501a47f862fd7ed74c68ed12b334d42473db2b10ce8cd0bbbe"; + sha256 = "0c60ea0722b974cd9edf0d5a9852b586da9bba5faa4973a060165b271d04e1f3"; } - { 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/129.0/linux-x86_64/pt-PT/firefox-129.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7e3e7af33b02149724008270b32c60b96da2b973716918c1dbbf677f93c5abae"; + sha256 = "4957427a93565084b239bc7bf55b6aad08534936c9b0a234fb0c4233d92e2b12"; } - { 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/129.0/linux-x86_64/rm/firefox-129.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f8158f3bb19a27cfff9759a541187e764ca5462656f01c007ad4a2f665316f80"; + sha256 = "b33b9bbf71f202e5828180bc9269ac0cb7265f6ae87fbf8e4b937cba56bc8dc1"; } - { 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/129.0/linux-x86_64/ro/firefox-129.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b34bc93ea8417c84bc549ac889f06537ab7c14a384fe2de6b11965822daf178c"; + sha256 = "6e339eb1b710134bd5d060b8810af874505740a67e6a54c7ea54be7cf644b092"; } - { 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/129.0/linux-x86_64/ru/firefox-129.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3317259104bf35c1063411c61c24012c603dde4639e4cc1738746594ebd541d0"; + sha256 = "0d5a5c5ebbafa761c4ad8dbc221997cf38f0d7047a70c2284d3a908afe7631ae"; } - { 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/129.0/linux-x86_64/sat/firefox-129.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8554b21b9f4e47ad8d55bed298fa23ff615358a2f4af9e3e747fd1633f26a535"; + sha256 = "53e738347d41f7667c8ac3269ff9f3d9a0de7e3874f7c24ec09ac19b98cdcce9"; } - { 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/129.0/linux-x86_64/sc/firefox-129.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c5a430c37a1904d6c12360dd653d215397ac1c37ff3360ca905df0f10fc63eb8"; + sha256 = "02408e05f019e168591fdfdce5952ace1f67477c92d4cd5385030e555df8f65e"; } - { 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/129.0/linux-x86_64/sco/firefox-129.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5eeef923d89ffe4ff1d3c059d9e793c599159e541dd553e5e7be367879faeeaa"; + sha256 = "952c5c8fb653485e19f35c7b4ec060af98967b3c017440364fe85d60d03d3190"; } - { 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/129.0/linux-x86_64/si/firefox-129.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a4f73e9a5cded4b81678d5da752443428659e64124365243d39397dd53a7a1d6"; + sha256 = "aba67b862e7a8a0e88231d5244edbb5baa88398fc6ced7240ef8c6e7b45c62a6"; } - { 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/129.0/linux-x86_64/sk/firefox-129.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c068e5fb31a5b55ca3c42cfac286275584239349d3210942b66d8cbfaffdc4dd"; + sha256 = "1361d7d1083d7fe43cd94db8b2352360b4d40fb4f332ebf8724a1bc380757ff3"; } - { 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/129.0/linux-x86_64/skr/firefox-129.0.tar.bz2"; + locale = "skr"; + arch = "linux-x86_64"; + sha256 = "c04172d58dc4ace693e16293176079ca7a224dfc20528fa8ed66d9205ee70322"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0/linux-x86_64/sl/firefox-129.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7f22b8cde10c11aca641f7c14176c59d86b79a654e68bafadeadd4fb7e1ff3ac"; + sha256 = "a3da943e3edb6d381d44058cbecdca4c0ee686a3df1abf1ba6253756bdb5673c"; } - { 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/129.0/linux-x86_64/son/firefox-129.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "80523ddb2925d2252b839a0caacaab95770b86835385b7b58cb0b18b522065e3"; + sha256 = "48722c165017e6ac6d1654f02d775cc9f79b92272c76050e6afe66f93334e3a0"; } - { 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/129.0/linux-x86_64/sq/firefox-129.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a8532d02deef7e88bd1a9e5a7a906718994418c231c12109400ddb675f347fa6"; + sha256 = "55b45315e6e76d7e127c0d60d14399b40f20f04ebf574f195bb29089f62a04b1"; } - { 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/129.0/linux-x86_64/sr/firefox-129.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "462c47d4ebffbc6864be452b3fc00fed2c7cc14c26f28a6d0de3acf7ef817e3b"; + sha256 = "5b503fcdc4f03280da86f0de2d92f8bd57c177b9772517331d02fd3dc5b948e1"; } - { 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/129.0/linux-x86_64/sv-SE/firefox-129.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6ed60502aa9c7b976b7c2bd8daa6c7f112afac6391db69b7538e2d8ccd1b084c"; + sha256 = "c5b48b0cb3e5b38efc3b3d797058ff6df91eca596c1ab8ba537da7cbf9ea0cb5"; } - { 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/129.0/linux-x86_64/szl/firefox-129.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "dc4caf3f2c931ca69d742afd807c9d1f62fa751bf94a15f2e3c9d06b45ab8878"; + sha256 = "43538e14f53dfb0cab4a006f70445b640b4584b5f2e327deacc4347877e71b44"; } - { 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/129.0/linux-x86_64/ta/firefox-129.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2d60ac71d827cc6dbcd09432c23af4ce2f6ba1095cb3ec19f0f9d9e4a3cbb6dc"; + sha256 = "41faabb8a5cec38d688c63435224cffed1fec922e8b14d6cc9168e51e0c48c83"; } - { 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/129.0/linux-x86_64/te/firefox-129.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dff77f564ece7beb32830c7bf7862d80f6b606fdc31a9fd369912b813f139536"; + sha256 = "7e8af264b74ffb2eeac416127ab24c08b37bc9680b6e1ab90e6fdf9a5fb4bb0b"; } - { 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/129.0/linux-x86_64/tg/firefox-129.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b9241d728186d4f369e94fecab46d653853eb1408166e56f7cb435ff52ccdaf2"; + sha256 = "526f0209b33e89ea128edf7fdd080001241b1b78ec95fce19c692a95b77ed06b"; } - { 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/129.0/linux-x86_64/th/firefox-129.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3e87332bcc8c998758eb9493393e91979c12204787efdc450cf480841e11ef31"; + sha256 = "5a4eade1e11cfcb2a37afb6b44213846e530e26331c1b48929ade8b1a7d9bce7"; } - { 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/129.0/linux-x86_64/tl/firefox-129.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9aa9ad4d4ff39cc06eb8180521124503238ec809e3c621ab037a0d0953448950"; + sha256 = "56831a8f76b705e777f1180649dc9f14e3813df45a6e106da5a361bfba033ab8"; } - { 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/129.0/linux-x86_64/tr/firefox-129.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fea0de874ceb3b1febdf0af171bb8e2a77807b4be968ba843950980f61aa1bf9"; + sha256 = "d162ec9c029c42690924c2bdc15303791a0d3a110eed3f91a4761210c4dadadc"; } - { 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/129.0/linux-x86_64/trs/firefox-129.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b5e1ab4ee7050b903c99549329dbae45ccda6389c2db850925621e4d3ba9da21"; + sha256 = "d1bc45f60243b628c492e6aa794aead4ec4f3039f188e5bb7c7ac53c858b0817"; } - { 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/129.0/linux-x86_64/uk/firefox-129.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "61c1ac45be55258e45533aae32b9a95c55fac81820445d0e464768c48509fec1"; + sha256 = "00708d2fb6453035f0ef85e8e565262dacb164fb2a598a0329128d7ac4880f8d"; } - { 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/129.0/linux-x86_64/ur/firefox-129.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5dc29c0ba5a0368d09f73675633d7110b64b8ff9233ace5a0769e04b9c7eed7a"; + sha256 = "a1fc2cdc5de02b694b5398436a18468250cf18a258fd69eae43ea69d2e4daff8"; } - { 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/129.0/linux-x86_64/uz/firefox-129.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "39698fa62f4361805c5a41f81853d44e082dedf78cfc5aefc58ddf5a00823ecd"; + sha256 = "04e21ae2403c1ce01a8ac6db3c63d4d80bea946a2e5e15457641c291176e42a2"; } - { 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/129.0/linux-x86_64/vi/firefox-129.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5372cc16c0128005f282018185ad725ab65b5c04140a10a014efc2cb1fd59943"; + sha256 = "f837a2955f3129506af795865c262e68b488dbc005b542517fa306347964e05d"; } - { 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/129.0/linux-x86_64/xh/firefox-129.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5d4ed46c1fccdea8ad2be40aedd0ccb2d3608473cd450005a0dc6da356ae7c43"; + sha256 = "34b39f92da8aa6c92e06ffb663cfa489ac086fafaf08dc579f30610344d6d70a"; } - { 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/129.0/linux-x86_64/zh-CN/firefox-129.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a7762c58e6839f764c10fedd2da38477be15817c00070b234af4f59495ab22f7"; + sha256 = "420927fe4dcf2aace90d18fb3d355f0df152bcb12b1f209b3d3ac8772663ad65"; } - { 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/129.0/linux-x86_64/zh-TW/firefox-129.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "55f6df7a2cba4b4a317de9285f9c6108267a3624790ebc6eabc0d497ca165d01"; + sha256 = "de3b76d031c813a2c14bbebd738744f59dc131a2335fbfdb56b218ef9af4b88f"; } - { 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/129.0/linux-i686/ach/firefox-129.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4262826552bf7012483cfb5a61c4cb3d99cc267ac84dd4eaa3fad4cb144910c0"; + sha256 = "47bcd0950d4002ea16cf1725e092c2e5752d06c1dd90b0c5f34430b426357aec"; } - { 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/129.0/linux-i686/af/firefox-129.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "da855058e17f89360708f658fccbfe1a099b5a82e1071227661c9a7bc1a96b4d"; + sha256 = "63288fe9494cd5c667e2a865ff34747cac8b2e80e4cd0166e19158b2ce4557f8"; } - { 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/129.0/linux-i686/an/firefox-129.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "20a8e588bc34e47582d815772129e6c77dca40d7bfece63493dee9a003c21671"; + sha256 = "116ad8a523c27ed0bb791cc69ea91350699906fa8b49b345a08fa53aae9df346"; } - { 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/129.0/linux-i686/ar/firefox-129.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3326c461896dae10a4c2ce300d58f36f38e2a6bb4bb2277579f73923eaa5e14e"; + sha256 = "4810c51795f04aa391dd4e3ca7428b5eeaa2482793d89f402a064947baf2c601"; } - { 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/129.0/linux-i686/ast/firefox-129.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "af90ec9c53be0e0d885f781ea90db3995c7b0e323e91d793aeabfa995733ef91"; + sha256 = "3106eedf4d26a65af38e3e44b1d408e0dd21ed406b672353176dfa3c5ac05d42"; } - { 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/129.0/linux-i686/az/firefox-129.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7a9c0ac72f90b44528f88be35bb5c18c7dc02819cb2cc9cc3b42628ce59a54bc"; + sha256 = "7190d67435073529bc499710c9fbffa00f8c0e66d299724d1348f74aa60b49b9"; } - { 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/129.0/linux-i686/be/firefox-129.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "734fdceff2b722617e1aacd817ce823c076032481a731bf73b9184fca19fd035"; + sha256 = "4273134a7e699b7d812dc76c2e47831456a758856bd780ee32ac220f276ae10c"; } - { 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/129.0/linux-i686/bg/firefox-129.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb58480cf5a0291a40e8b95bc3083bbb7d251d9d82cf84ccc400bf3b60665993"; + sha256 = "11fd73c02ee4bd2c9a06a40734292925c47747564fa007c04a0bae690cbc2ab7"; } - { 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/129.0/linux-i686/bn/firefox-129.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "678a0603ad497544b1bdc68181fc5ac9e2acae0eebd9946fb44315668ba78ec9"; + sha256 = "5e4c8cad3653b3475989f3d61404c20920eebe3b55755e2f92ba002d0a9ff3fa"; } - { 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/129.0/linux-i686/br/firefox-129.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6871ecd32da428ba9c9c8fd6c28401f1c77a79fc617304f330c42a57d866010c"; + sha256 = "4e0170a3211b9cc22f762b54ddbde29ecad86248a3492619145f59d2d1473284"; } - { 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/129.0/linux-i686/bs/firefox-129.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e3fcff0fd7f5354a080c222c8002497255040b19f5294d9e68a08379aa6ffadd"; + sha256 = "7acef5ce37fbaaa8c24965fb382d539675f233ca537179eee6612bcd85798e02"; } - { 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/129.0/linux-i686/ca-valencia/firefox-129.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "e50fa7f62356438911b2bb09753891eba70d5339367707cddeb72734f912f0a3"; + sha256 = "bc6312971fd2f7fe9b2c51e263c26d236856fc7e70f245c8f503323b00c61485"; } - { 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/129.0/linux-i686/ca/firefox-129.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2eaaaa67d02e15ae63e629ee51c0eea1fb305a7a58d0493e08bd780bdc532488"; + sha256 = "ccda60b64ac8c6c664353b89f5b8859c3429013fcc1c65f1168f4f4ab68fc200"; } - { 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/129.0/linux-i686/cak/firefox-129.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bbec0e259064cdf9337a160176b336ff27e1b28757cd862e6da92dcf2752d84a"; + sha256 = "2cd8fdc3097df9d55a5c7f77ec0ccf7c418dd6dd8f79ad36b33e5f7e0951501e"; } - { 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/129.0/linux-i686/cs/firefox-129.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7b5fa6fb597ab7e2e226258e97480c6426478e774925098719135fcae93caf18"; + sha256 = "d27cecd12e4271914dd55c45b57185f3ef12af2abbb4e02fd650df837d51d33d"; } - { 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/129.0/linux-i686/cy/firefox-129.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "be3f396e41fd49660dc739da888a472cebbfb2604a73d297d1f0e227a545631c"; + sha256 = "84dc0ed816caa852b6e528fecf691eb728b686376f873d591a593ff3da06a255"; } - { 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/129.0/linux-i686/da/firefox-129.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ce41505935ab911282d2f2e3b94c55b08622dac3c7f0f28d982217f30664c678"; + sha256 = "35ac2774f5fad5a2057602a20f78d131872fa54e0a7be1ce2c6af026ae06dec5"; } - { 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/129.0/linux-i686/de/firefox-129.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "53d38a12dd1bcd2f9c2be3c705dff59a431eb83b67f99183f62277a03d08ea68"; + sha256 = "dff146894fbe2abb224953549df7839b473fd8052d3172a28101e5ab245b4f12"; } - { 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/129.0/linux-i686/dsb/firefox-129.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ce1ef936bcf93eb5068d35a6c9bbecab34c6f013319dd81c6197e02dcc4a0a35"; + sha256 = "94fc2321c92a5ba88ffe43445b868499f59aabb96c53e97dea19aa992312bf30"; } - { 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/129.0/linux-i686/el/firefox-129.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ee2623c0dcd6419bc8e306b4e31d73bc554ac85ac0e71236d390d9c199f996f7"; + sha256 = "d3df30ef0bdb55668eccac0e3311319de352b56efbdefc8fe25dc3e3aeca55ef"; } - { 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/129.0/linux-i686/en-CA/firefox-129.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d0b56528926ac55de06f7210dda2af604d0f2b59d632c54cd12b0a061d4660e7"; + sha256 = "92982c609615f6111becac855b3aad4a181bcd9bad8337c812a72acb14494bc8"; } - { 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/129.0/linux-i686/en-GB/firefox-129.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e860d7a7a66e2b8ccc8f8a31b1bd6c9fe80762e1e15c99918100504411fe41df"; + sha256 = "cc6f6ca8ad1e47c383764498fff47db1c9c8430e52a1bc506554051eb2ef70d7"; } - { 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/129.0/linux-i686/en-US/firefox-129.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "825248c30801f7b8cb271cd9725a699c0b3d68bdc176d58a46af5032ede4dcc5"; + sha256 = "c9a4d425bbdac9daa65325f89e89bd31667b151638b6d4625d9a74cb62a9c092"; } - { 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/129.0/linux-i686/eo/firefox-129.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "965369b3eb67330f3a8dbda2e20811f7236a0ffddad2a742235368fa995237e9"; + sha256 = "41476795ccb427b727040bf315ab3a154f056780f509364d7abdf119bffc798d"; } - { 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/129.0/linux-i686/es-AR/firefox-129.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0a1d0dfc416b8eeef96b79df5a4b5443763d728cf13eaad8cc3a070149068545"; + sha256 = "3a4e2fa43df137d7b4a9478c7639f264dcf8cc9c5f25576abd76b0005ba18f83"; } - { 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/129.0/linux-i686/es-CL/firefox-129.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4cb753e847f4c677faaa6683ec78f2de59ffd14e1ce2a67f2b09ca8710126910"; + sha256 = "82b144cdeb68ceb53f1d826de0bd5b10455bc34c18340c3cdfec13470e4aaa85"; } - { 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/129.0/linux-i686/es-ES/firefox-129.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "affd43cef6f9620220274af159c510d63b0bd86a7aa0bd856c8f4e33a822b0d1"; + sha256 = "fca12e3e60e4c48db0e138defc0e802e8f7f35bf056ba107dcc332cea51743b1"; } - { 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/129.0/linux-i686/es-MX/firefox-129.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "689e02820959797262a7a66044f0af9119c20aafb7373409cbd8846fa79e7a88"; + sha256 = "b5001c154aaff4e868e4cc717aae39af5118bc3c59df2f7ef27c0e99b16971f2"; } - { 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/129.0/linux-i686/et/firefox-129.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0323c8ecc0c39cf71e1d3e8ef9624ddeb6d8f9d65f1758b7e274309a40d5fd9d"; + sha256 = "d90729a7da8a7792d3406ca9fc0965c0134561484338dc26aea4fce8d653ac45"; } - { 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/129.0/linux-i686/eu/firefox-129.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3838fddba1cf529fe02dc7261194c083112fbc9344c8804611d9e24a7d4172d7"; + sha256 = "129222f2be03f8ba1b78f13e1128a8d1d1d2a7e15a6b63fcead56404b4819391"; } - { 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/129.0/linux-i686/fa/firefox-129.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6e6fa470798f9a048a12624f8ebfda5a174c3bc86f76552965c5bebf22d6b803"; + sha256 = "85b1972cb0803c03462a42218f9c5cac03e634b10f7e9026659523013a488264"; } - { 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/129.0/linux-i686/ff/firefox-129.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "051b1b02423188025cb916e68c61deefb02b0588e0630784411a9d5c3d36365e"; + sha256 = "f74323546697e6fe1e7ad63117b5234a179abf1ece9d01286b2a9acf2aebacc6"; } - { 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/129.0/linux-i686/fi/firefox-129.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "087d6b66e48b50c5d13385ce850614324a857cbf2439cf29c4ef9730fc4cf3da"; + sha256 = "e55e54e61e2924f8657cdaa3feac7de47af6ad7da46055bdec643a49373d9a59"; } - { 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/129.0/linux-i686/fr/firefox-129.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "463bd8478a07ec397c678614c3a80a762170a3dd0b5a378a4fab77931b0c0144"; + sha256 = "c15091eeeb017d9b79c8303a8856341b649b9634d1e52df41c8b284d96a7f247"; } - { 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/129.0/linux-i686/fur/firefox-129.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "960dc76265a02dabdf84a660d6fad6486eac1aeaa1f60bcddc97a0e138f462fc"; + sha256 = "920ccbada8a1c7c7bf646bec8aacac274ef558c8d338571b5c8f39ab49c11b53"; } - { 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/129.0/linux-i686/fy-NL/firefox-129.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3aa004f2114f24c435f53231f48a4e294ee43a4211909c0160c377d20d9e0e2c"; + sha256 = "8e16dcef365c2b96070a0dfebe9da81ada901d2d7671df1427e9c0547dd5fe77"; } - { 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/129.0/linux-i686/ga-IE/firefox-129.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d8b3829c838ba4374f044b477e7c5f3b569fdd4211266a8530dae2a571496967"; + sha256 = "440189a69a7cd9a9d45bb46d3c00c2ae6302d13fa7f8fc616ac9f9fd541cb708"; } - { 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/129.0/linux-i686/gd/firefox-129.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "290030ddc0271faacf82e9c28a6b39b04f5ec3a1a2f3d6ab9500043760eb1d8d"; + sha256 = "4f62553d05d5e3214544994b584da4a8f97640d29e9bb5def4faa077270f425b"; } - { 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/129.0/linux-i686/gl/firefox-129.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d1b185fdeba1bb8a8001deebd4b1901b8c2bedbe6f83ab7a62afdea0812a73f4"; + sha256 = "6a95090d9caa6f0290044135d9ac9c1eaaf2f419ae4be875b6d581a0b8da2694"; } - { 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/129.0/linux-i686/gn/firefox-129.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "876e0b5a5cf938af23249491cbda56cdda4f41bf9094be6e509805d96b8885d6"; + sha256 = "172cd7bc91340c9469797822efb5a16c2396b08785a10f9cba99998ffbc1925d"; } - { 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/129.0/linux-i686/gu-IN/firefox-129.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "034dd128c5d5b1bbb341dcc65b6a575623ee544f5d7319b0b257cd3554ce2cd5"; + sha256 = "a006bc51eda69c33d8347c316e540f4bdbbba0d9503e3c950e1834863b5d85a6"; } - { 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/129.0/linux-i686/he/firefox-129.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "68636a8d11c9abc1c24e621a966e4f00a7064e2b9793c9f6ecb09c36781c28da"; + sha256 = "ff9166f14bbb52d9e6dec335ebe42fdc5fd0b71a3873b56bed3e8c5356060312"; } - { 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/129.0/linux-i686/hi-IN/firefox-129.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8219e7cbeece71af3c87ccc92bfac707d4e97041e3dc0360d816b47b2490b1cc"; + sha256 = "d119a8d6b98fb56bd2108f1de61455ee5c7a62ef6913e211ba28ea8e85a0fcdd"; } - { 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/129.0/linux-i686/hr/firefox-129.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b7245d5b926be172976d66815676bc44489f45797b3080966690c3eecfde22eb"; + sha256 = "b5dabe9c6a2a17e6a16a7e33db42e2cdc3ff4aa2340f09d876d573346a8a46e6"; } - { 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/129.0/linux-i686/hsb/firefox-129.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7e76beca927640092ae2bcd58b7fd6bd0174dc07dcd847335d40a7c5a831b99c"; + sha256 = "2c6085402407d5d678986560980c8170850b2a2dff55414f5b001dc2cca89788"; } - { 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/129.0/linux-i686/hu/firefox-129.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "077fd0c025277e2fcf64a673e5ef32732f2c1d6c44ab1ffa02e7a542466b8807"; + sha256 = "8658a7f952d670e8f37c2f251a2f322c0ff55cba95e91d95eddb23dea532874d"; } - { 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/129.0/linux-i686/hy-AM/firefox-129.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ae478b9d6cb6cb028f5644d15a95c1b495699e9d1db31c9165f8787c40bdd2a6"; + sha256 = "73b58d61884f2ba31af1ea9b2be3183eb4ea74598b03e3ec0131c8b908d6f892"; } - { 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/129.0/linux-i686/ia/firefox-129.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9b4fb99f9447ba2712edb296f35deaea72371406fa592a8937d14c8cca1c015e"; + sha256 = "1469a9999e3dd70615b02cd3f718732c16728d7f8525bfbc6c55b611a8447906"; } - { 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/129.0/linux-i686/id/firefox-129.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "849ae2d09de46a7f959af6b98d4de49aabfcc40fa8a672832f15509f8e0c0627"; + sha256 = "3f73b0d29ad022781cfc83ae0ed1dd1dcf9bb0d4b4e6ec6608752f8272815ce6"; } - { 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/129.0/linux-i686/is/firefox-129.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4ab5465ebf5d6eff987ce883146ee40ec8dfb45aebf7a8801cf938335776acf0"; + sha256 = "8d4b03d56403e85748f9c3b626381149ff34b4713e250f8043d46b31476abaf1"; } - { 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/129.0/linux-i686/it/firefox-129.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de70b14a007dbe09888a824f0e71ca3951f557a00a4b377f7ca4bd80558b22f1"; + sha256 = "6d04b20abc706f360868f31da4de8e5ac4e598aa772845ab527df932af8eb8da"; } - { 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/129.0/linux-i686/ja/firefox-129.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c8ff213cc59f0bca39c89d0a8167db48603a86623e6204f288c613acc6aaf71f"; + sha256 = "4e94ae7917aa0d09729067a03f453df4022ffa97744135cfd9fa5d06dedf7086"; } - { 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/129.0/linux-i686/ka/firefox-129.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f9d04949766ce80414059f7c8dbe0782c77b81e2b37b6ea8d906dce1a41be5b0"; + sha256 = "15130189f53cc2dc9b355061e03690bc18cf6a3bac3c40ace6585a1a716915f3"; } - { 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/129.0/linux-i686/kab/firefox-129.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f393d8df2412edce4713abcc0aab4d43b4d15e146f83956ee2c180757d0843e8"; + sha256 = "8c5964c311dddee9c131c8fd3b97e1cb6306944e9ea890fe1caaebf1930e5adc"; } - { 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/129.0/linux-i686/kk/firefox-129.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8805bb373f8325479976817ce50431e01371a1ec436d74194d6677d168539656"; + sha256 = "464f7e4fba66fb261c37abc755860e4ed95d9cae0e4c7f3f4b67a5ab9195d2e5"; } - { 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/129.0/linux-i686/km/firefox-129.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "adf07e405ebe47f7f3d0033ac9660f28331a63b90fc5d909134be53f771e0a4a"; + sha256 = "8f55346a3c1d752c7572bb27eb913dd354d9cf6d30cec391732caaf38ec2758a"; } - { 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/129.0/linux-i686/kn/firefox-129.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2950df4ec7f7aded583b696779313ea94fc0b718c3b10ec4f754adfc0f65471e"; + sha256 = "410a6fc563a89367064a29c963bda53eb4cd12c4b3822e3af95d982f107219cf"; } - { 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/129.0/linux-i686/ko/firefox-129.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6eedea929d7d73dce79c8f79632efce1e0591bd52948bbed468bc5240baef05d"; + sha256 = "88e9528bc312ade6014736f69633670e0260299a06bdba4df47974bb9f3f17f3"; } - { 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/129.0/linux-i686/lij/firefox-129.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f0f20a048c694f8bdeb70783476fc6f91b4f7d2881093cdc5d0f9f3a12d698e6"; + sha256 = "95c04b2a769b615d52fe4c2be8fe07ac1f3cd021775a878f6b623f5e8e662499"; } - { 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/129.0/linux-i686/lt/firefox-129.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6762ac48b93aaf619f3e1c16d1b2e5d75596b3c8fe4d374e563f44d377de4127"; + sha256 = "cf732afed1c5a140831fc07b4bdabdf6e0ae807ca0640530bcbc5a25df4d5e12"; } - { 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/129.0/linux-i686/lv/firefox-129.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5a3fd3b8afc54c4659194ca479b71bd19371e3fceda827c1d93e4f86f7b69156"; + sha256 = "6b78cc1601e6b1d32f71e553daab49824fc5dd4c53a84dc01a9d0e70803c0134"; } - { 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/129.0/linux-i686/mk/firefox-129.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "370271f309ab7512ddec0b20e4be5765c5ef664680ef98d89fb2e263ac304f73"; + sha256 = "80fece97ab4fa5eb2a8157a60c3f3b476bef6594567fc6a71fdbfc3efa1790ad"; } - { 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/129.0/linux-i686/mr/firefox-129.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9d0b181157bce40bb76e34ba8c555b1aacdf86e286124a5fbfbfc678bc58cf66"; + sha256 = "5d64345faecb5bbbd2cabe4ac6c29797c6216987ac788ae9d23bde20c3a5d020"; } - { 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/129.0/linux-i686/ms/firefox-129.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d9749603debebeaa7df69ad2826df95ed1fc9389fff53f1e362d33b1578e31da"; + sha256 = "b1e2a5f3b7e848b99deaa924c036febff2640edc3c7ffb137fc34e9cf392d489"; } - { 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/129.0/linux-i686/my/firefox-129.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4a2211461b601c37f3e8ca7babed6ac421cf49604146ed5bc5877cf60e0591bc"; + sha256 = "286dc139ed2aacac01390b7e3a540b46efcf1508de31cc351d589b8546c8f53b"; } - { 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/129.0/linux-i686/nb-NO/firefox-129.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ae5261b7c1e1075af26077012291a90614c75c56e044e409a10d84c50e145c6c"; + sha256 = "b01dc534e7800cc551ba9913ca80d5d57c4cfdec9b107fef95b0e41667693b30"; } - { 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/129.0/linux-i686/ne-NP/firefox-129.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ccee7bffdf331b7d35f2f14c18c4652f41f52fdcdb8e5fe1b5650ce65469ddc2"; + sha256 = "4d255d28e63e93c5ca60c7619417cdbfbf474dcedf9c404164822ebe98265ffe"; } - { 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/129.0/linux-i686/nl/firefox-129.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "04fbe94b04a688d732235cd1dcef1f7e1087d3b85f04699153f80a4c44c8ad9d"; + sha256 = "cd7b25a980672b89d5567b5250fd1b0fcc8e1dfe1b34a12bdf61d410eb4e7d53"; } - { 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/129.0/linux-i686/nn-NO/firefox-129.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "59796010366cb0ef66a1a59bdb40383abdd8f921c60f6b998f38db8c86255dfc"; + sha256 = "8b52ca241ecf61952fc731a54ef7c293a12f123bbe4c56314d3d30ef57967785"; } - { 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/129.0/linux-i686/oc/firefox-129.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3356edba3d3a324d4dc331bc3bef240d5245fc9a91b6dadda84c365a86b3457f"; + sha256 = "31270c7bf9435bb2eec7980f27337010a309f659451524c63533eadf9faae97e"; } - { 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/129.0/linux-i686/pa-IN/firefox-129.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7bdc84b081f91aee7db9161904d7c6ff0a1a8897d419aac804eb9d3a753ec7e"; + sha256 = "e3dd490aa310974f4814ac9e86aa18e807217d53d2db14ae8e04d6c119609fcd"; } - { 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/129.0/linux-i686/pl/firefox-129.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ee0c317681a149912381f8914acef222c643f47f35fd239ef495395622d2f605"; + sha256 = "d9ddad46e6ca35b68792cd69888ee0d3d62b403d9912a5f093cf1ef74d87832e"; } - { 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/129.0/linux-i686/pt-BR/firefox-129.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "18201b51d0f954713e5b2179dd3b934f46a0fb14d5b8decad4c9413814c33eeb"; + sha256 = "924739eb1a6d628ce86f9083a63d549da68649fa6e56b8fdb76744d225fff559"; } - { 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/129.0/linux-i686/pt-PT/firefox-129.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "10281f85b6683b87a1a30cd4048929099ae7783755d15748a8fa71dfaa488760"; + sha256 = "7e28a0fc6beeb3aa7efc2987e9ebee1097c6d5fe0d995de62eb26e3919ebc920"; } - { 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/129.0/linux-i686/rm/firefox-129.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "af7b78a46c9cd7320a240c78323c1e08c6619c280a4ba607647e357ae764ddb2"; + sha256 = "8f403329efc4fb97bb7fdc5b9dc85f74cda36985a42ad6354e1fd2b7b6522bf8"; } - { 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/129.0/linux-i686/ro/firefox-129.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "dd1062119e93cdeedd2872165344146960ac7d84bba456edeaf1628bfa75beeb"; + sha256 = "b8d1e29344b39a4be09f72d7f4d3afa3dd3498a58145c853b8be54e54c39d9ad"; } - { 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/129.0/linux-i686/ru/firefox-129.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "817b50cdec921e3b1f11726bb10ee3e1e53b40b748085fcdf589df76ba95ac5d"; + sha256 = "248d010e533ac2f3d017df603ce1e1951312950cc0629b392d5e41d91197bdc3"; } - { 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/129.0/linux-i686/sat/firefox-129.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "f09b47829fd36bd80f3c4d564a6a4b96d8f8db4a86ba96818d44f432908a96fc"; + sha256 = "6c5e2bdaa677bb4956ddd7a6a21d6b0cab70e721756fc492f0f9ddec438c2dfe"; } - { 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/129.0/linux-i686/sc/firefox-129.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "6fd2c2c3ba7c28548de56c7cb29737635d16b7f1b8d8f45fd9a7e98bf5f244ba"; + sha256 = "b4a966c4955fd970723d51f3ccf605af84cfee9612cbc4289c7a6b487211726c"; } - { 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/129.0/linux-i686/sco/firefox-129.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "02cc81f6abc80db0ce09c9010974193786f0199be95e64c6cf510c02934eada8"; + sha256 = "f698fbbb05126da5ce949644496e535bd1a1454a865a3e11fa2895746c669ada"; } - { 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/129.0/linux-i686/si/firefox-129.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0c11a867e5aa9092d021b89543bfb0b73dce6253bd9dd3e9db57b924048ae81f"; + sha256 = "b6c49a40d2d32defbce7754d514c6d781e4789cfd0bd074cd9772beb151423b1"; } - { 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/129.0/linux-i686/sk/firefox-129.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b4352e3d8ae1782c0ed93118168626d17a7b259d9b6c52010240a651468208bc"; + sha256 = "ee912110983a922bff13be7bd5c9c8ba8e97f1ed3e863208bf34923516713565"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/129.0/linux-i686/skr/firefox-129.0.tar.bz2"; + locale = "skr"; + arch = "linux-i686"; + sha256 = "a057617edc7ca114cee0340621274d98d0afc226f6edd14d3dac3129bf91e4ea"; } - { 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/129.0/linux-i686/sl/firefox-129.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b77650ba96f576b2cf3de2477915cf3b5806a75950fc3e5f65265eaf06c6326f"; + sha256 = "09e4e69db2fa98f18f59be4833f5c5e5d0c8bf0432f93c55605489ac334c83fc"; } - { 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/129.0/linux-i686/son/firefox-129.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5f5c0ec8e746094845fe3fec3577003ca20670a4e0b3fc66cf6b4df81d8b3b21"; + sha256 = "55cbc75b9cd3da8d9c4b03f880a43355a4b3448e0536c7ad64b97dadf70c42e1"; } - { 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/129.0/linux-i686/sq/firefox-129.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cada2c2e6a9b3c7f1042030443bc89ba50a2ca11b20bd2f11ba51c360aa97dc8"; + sha256 = "8ff3e4290e4a750ee551ea68863a4adddc34f8a848a0cef8733de14977b7d349"; } - { 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/129.0/linux-i686/sr/firefox-129.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "fe0d9aa1bcb3533eec8d5b1bf16da65077a5878cdcb9e305436622ee7bf7314b"; + sha256 = "770eac903c7c28265bbca63360977d33436e4d65bc236271e011c3cbbef9ab39"; } - { 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/129.0/linux-i686/sv-SE/firefox-129.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b485b5d2c7ea7a6447457062defe528aa3ebe719c58449e16e96f7f1d1a08727"; + sha256 = "b1e27d9cf04c2de94c696d464eca5643e57a2bae037d00f3d0a5364baca5ed78"; } - { 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/129.0/linux-i686/szl/firefox-129.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "eeae99cd1f2f4f34c90e384697a3853d10c09343d2325f97fd71534a9e0abb70"; + sha256 = "daadb81be0e7c6f8ad60625065421b25bbad71b72a8d4a92920fbe0c76183cec"; } - { 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/129.0/linux-i686/ta/firefox-129.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b094294592daeeb1f44aed69ce3c3f1eb30bee87448c18f6c7b40d56bf0f817e"; + sha256 = "7b5bd717f39da71cbc365d805169c280df7da7822425d6f4a48db434606e9fa5"; } - { 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/129.0/linux-i686/te/firefox-129.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8900d8ea91871843d5b2af4ec6ce375ef7929e7922cc33dea1c18454f9aa461e"; + sha256 = "2c2f07121a2af322ff868a09f5bd4993964fbe270c10f01ff05ed7a18bb65930"; } - { 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/129.0/linux-i686/tg/firefox-129.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "6e5c773d4153dc4a712fed7ef36b174caef3ff3f11a387da55455b19aa42c85e"; + sha256 = "c81394a1f324bc42bba9840e493e6ee433629e2675588aefcf12765d733e0d70"; } - { 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/129.0/linux-i686/th/firefox-129.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c6df131d396ddd81b200720eaf2033f5555089762e9307388c0796ca1904cdc7"; + sha256 = "efb60a38e7d4f46938b08cf074cca3a1830e6f9742d1605139314b70ab46054f"; } - { 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/129.0/linux-i686/tl/firefox-129.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c48c82424d10ffd93fc39f30b6c286931f5c892fd24fec1b988e7255c2d61192"; + sha256 = "c46d364ffe4ffc0ee91f1079620c5b3fd22614ebae43ef029b32b07c513b942e"; } - { 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/129.0/linux-i686/tr/firefox-129.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b1d43c2921a0bc9771e3a202d14b2d6cfef6d3a0617d72a2dc866c4d08c9cc07"; + sha256 = "e129a5450eb30b7e4f02cb64495b7afd131c5ec1c77931e491cbb40bdc6a5cd0"; } - { 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/129.0/linux-i686/trs/firefox-129.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9b93f3bae0d3288c46a69adaf24c028e69c819e81f402b3cb3cd119297bcec88"; + sha256 = "e58a0987fcb77817d31bfbf0f52a8e1efee0b6ed0cb5fcc93e4edee9c7a8ea6f"; } - { 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/129.0/linux-i686/uk/firefox-129.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2f535154137303050fc6d1f29d61e28d7156c0b41d1feb0b3df3cb4e0ff66cbb"; + sha256 = "eab93411b18d63180bd231a8ac2e20874c4130f61f5b8ff66f6e81d59a1b5a31"; } - { 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/129.0/linux-i686/ur/firefox-129.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2607a196623e8b58e74930bb5f4cd188d105957441078e32a8273d6edc872a19"; + sha256 = "4598a120c6798c78c2896b6cdf9ccb0a86e93c4d92786d70d338b86a42346a77"; } - { 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/129.0/linux-i686/uz/firefox-129.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1ee778cd7fc6ed36888252279cd33ef354a9dad725e35a5929ca1a6d457c2e2"; + sha256 = "9149dcae7b8cd71b1bf9673cd77e0de74e0a0757584db1f073370b6b52d2eaa3"; } - { 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/129.0/linux-i686/vi/firefox-129.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4e587db961e4269a5de47e81603effab87dc5adecfb2b61cb442c520e066d068"; + sha256 = "b351c2f1fe20d218b46ddedda5cc2de303078a0838c5ee8628a61daec6b02bda"; } - { 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/129.0/linux-i686/xh/firefox-129.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5c550ba6a8b7e9b518f3e538d6e9d87cbde3799fd1e8d1d4bcc293f740a9b422"; + sha256 = "b3699ab31f9e811684cd786cfd7842fd31a4ac092c93861dfcdb69ad8600b5c5"; } - { 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/129.0/linux-i686/zh-CN/firefox-129.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "30fabea5d68f18b4818bdd5ae2290f4630d95218fbbf34e1799f321e35f978f4"; + sha256 = "ecd9c0b476de33542a581d4012b6cc66a7bdd823b303b82b14029abadf4b65a4"; } - { 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/129.0/linux-i686/zh-TW/firefox-129.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "77d96850c2cc6fa3ceff3d8b8c01d06969c2b71df4cf3b417e7e5519db78b40b"; + sha256 = "83c3a255bbce16798fafba4ceb57ba68c2e95e8b11e543fcc565eb534042a5df"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index bdef9b125d071..593a642c8652a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -27,7 +27,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} diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 81ab6cd1fa17e..4d28004a0d0da 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 @@ -487,7 +487,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 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..28fdbe6f12112 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 = "129.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b"; + sha512 = "e406d00dc53c66a1ee6b56e7001efcdd8b323caa3676d66d874d39a99f44ac7cebf4c60d76b5d239ebcf834a75cecabf801a74a1d08a97a66ea5e8ec6c8f7c5b"; }; extraPatches = [ @@ -33,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "128.0b3"; + version = "130.0b2"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d2519052244dd6d5cad39afcf78e86b17e5f1520f3f182db123997f8d126b048cd6862e92558c8f112224c951f706ccf1ccb2cb19b5221d4a47bc7154f562ab2"; + sha512 = "bfba17643923ec10686df7d0047e0fcba7716f96a645722869cc472f68bb42415e63ce37905a7d41f1bb3aa139ee7d336ac838bbbff105b3785eb522ebcb7eb0"; }; meta = { @@ -62,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "128.0b3"; + version = "130.0b2"; 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 = "ef26fa3dad6fdafe8e8e2d9d88101b75244b3f21a499d0b61c4a2c9a0addbcd3184274096a34da958b0ab2489ecf6c3d7684a1f507ed687648b96f9e9e2b123c"; }; meta = { @@ -92,13 +94,42 @@ }; }; - firefox-esr-115 = buildMozillaMach rec { + firefox-esr-128 = buildMozillaMach rec { + pname = "firefox"; + version = "128.1.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388"; + }; + + 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.14.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d98475061d870e0f3aa920b7c0b9b0c1cbdb3f4102f760f1d1c5ea3e45e216c673c8d3662501e7e78af4950a003a519e94b57e9b1eda8d615c159cdf62130e89"; + sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54"; }; 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 79df553d3ac2b..24319ea1a4f70 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -17,7 +17,7 @@ , pciutils , sndio , libjack2 -, speechd +, speechd-minimal , removeReferencesTo }: @@ -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 ]; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index ff36607709bc3..b64ce1fdf72c0 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -3,11 +3,12 @@ , fetchFromGitHub , buildMozillaMach , nixosTests +, python311 }: ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.14.1"; + packageVersion = "11.16.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +16,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.13.0"; + version = "115.15.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; + hash = "sha256-bmB88EIc5S/EYZXiQ5Dc+LjcGB4dlwKRBBV0T0ln88E="; }; extraConfigureFlags = [ @@ -32,10 +33,12 @@ ]; extraPostPatch = '' - # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin - # https://github.com/NixOS/nixpkgs/issues/314115 + # 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 /usr/bin/floorp floorp + --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"' ''; updateScript = ./update.sh; @@ -61,6 +64,7 @@ enableOfficialBranding = false; googleAPISupport = true; mlsAPISupport = true; + python3 = python311; }).overrideAttrs (prev: { MOZ_DATA_REPORTING = ""; MOZ_TELEMETRY_REPORTING = ""; diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 954bbf25e08d0..033b20dca5ad2 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -7,14 +7,19 @@ , tzdata , unicode-emoji , unicode-character-database -, darwin , cmake +, dav1d , ninja , pkg-config +, libaom +, libavif , libxcrypt +, libyuv , python3 , qt6Packages , woff2 +, ffmpeg +, skia , nixosTests , AppKit , Cocoa @@ -52,13 +57,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-07-11"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; - hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; + rev = "da8633b2d0ab3b9d8f1cdad39a8ad85ca2accf03"; + hash = "sha256-NJSuhJWxeGPOVotK+s/mG2bfq19su08wBoxFDs/H9JU="; }; postPatch = '' @@ -76,8 +81,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 @@ -116,9 +121,15 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = with qt6Packages; [ + dav1d + ffmpeg + libaom + libavif libxcrypt + libyuv qtbase qtmultimedia + skia woff2 ] ++ lib.optional stdenv.isLinux [ qtwayland @@ -133,11 +144,8 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DSERENITY_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" - "-DENABLE_COMMONMARK_SPEC_DOWNLOAD=OFF" ] ++ lib.optionals stdenv.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 @@ -151,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Only Ladybird and WebContent need wrapped, if Qt is enabled. - # On linux we end up wraping some non-Qt apps, like headless-browser. + # On linux we end up wrapping some non-Qt apps, like headless-browser. dontWrapQtApps = stdenv.isDarwin; passthru.tests = { diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index bb35d92a3d627..e662874dc05fb 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -10,7 +10,6 @@ rec { extraConfigureFlags = [ "--with-app-name=librewolf" - "--with-app-basename=LibreWolf" "--with-unsigned-addon-scopes=app,system" ]; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4d679853fc5ac..9e572ff22c739 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "127.0.2-2", + "packageVersion": "128.0.3-2", "source": { - "rev": "127.0.2-2", - "sha256": "1f4xz496x1nf7lmvk50hakj9p6q0kzxl5f9s2k0b6kczvyc8gw5n" + "rev": "128.0.3-2", + "sha256": "1g1biavphqykj0zvi1brakrncj1h4gqhs1cy5mxlp4w4p7ahpv6d" }, "settings": { "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2" }, "firefox": { - "version": "127.0.2", - "sha512": "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b" + "version": "128.0.3", + "sha512": "52a0a1a6fa653f5a621a9e16e1937760c05a5ebc81a058ecc16b2c3d29d09d418dc5129deabed86ad2f82abdb3100969478a67f48b11616dc3b3e3698a1acf51" } } 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 2d7fcfecbd095..0f596386ace97 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.68"; + version = "128.0.2739.5"; revision = "1"; - hash = "sha256-ThWtnWF7iL0OEq7+yA7vCowGZrjeiLx+d+Nff4Bwl4s="; + hash = "sha256-y+587iVWgPk2a1P/F2iwSW1NEnAJaigL6rlVmqaIDJk="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2651.2"; + version = "128.0.2739.5"; revision = "1"; - hash = "sha256-eYCxGMIjclqFxOy6AyLKN5DJnplq/Vf3ClYbYWV3HAw="; + hash = "sha256-zY3iGbeYlOoArNNdF1qNwdtp25P0uWJmVMEK7kJIiqQ="; }; stable = import ./browser.nix { channel = "stable"; - version = "126.0.2592.68"; + version = "127.0.2651.86"; revision = "1"; - hash = "sha256-btpUMmgZ9SQL4WGKynGA/dL/8Ve9hdjoDNsBNxG531Y="; + hash = "sha256-1Dh+OoTrghn9ArvEnBZCkLnUf0m0qnkEtCoWjA8QId4="; }; } 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 edb62c692abe9..0000000000000 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ /dev/null @@ -1,277 +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" ]; - mimeTypes = [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - })]; - - 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/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/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index c594fa7328adb..36327e5219946 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 = "111.0.5168.43"; + version = "111.0.5168.61"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; + hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo="; }; 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..49f6656c01ffd 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.2.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-GUizOnsjEq2UuRaBgjmsQLHuqnCt/MHFBb8lTHcwJOM="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-To/41og5hxFL6efJhNfRNJw/fOXZA5Le16DZsSJrXfc="; + hash = "sha256-RBEqBJNttuyMpeaC5scSY8Q2meZjgdeS2pppQ1n53uY="; }; }; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 06391355dbfdf..4cd667083e100 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 = "20.1.1"; 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-2bofd/2Eu2jpyvp5l1/Q6QIY2t7xaIV+ZhneGG38dA0="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 358da2082c0af..3f676ecd6cc09 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -43,15 +43,17 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking + ] ++ lib.optionals stdenv.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 12b0c63b6afe4..0000000000000 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ /dev/null @@ -1,345 +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" ]; - mimeTypes = [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - })]; - - 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 3eccc3e016617..33ef7b5196188 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.8.3381.46"; + version = "6.8.3381.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-OR79+Y2z9b8aE5WecIlbJsJx6wdMDnlWjCE9HYmOfn0="; - x86_64-linux = "sha256-F8HibI1fWI0nPWaXDNgrSHcp2iTuC9LZhble877zrMg="; + aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo="; + x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; 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 0d42e228b6b98..fb7c2ccc997c0 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.6.1"; + version = "2024.7.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-hgZ9+ltS7y5nOPdGFnql4KzgBXh5zgAfXLJy8REOY8o="; + hash = "sha256-zz8xwIgGnMJjSv2XXUgsaUKXvHtXVuc2jyahrZ/yxmE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 3ca193f56c2d4..ac1d51ecee3a3 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aiac"; - version = "5.0.0"; + version = "5.2.1"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-4XjtzfICFCy2mA0FK0yV/hI5PPVpgXt5LlJTAxQAVq8="; + hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw="; }; vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; 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 c4698ed9338bd..59803dabdf27e 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.4"; + version = "2.12.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k="; + hash = "sha256-l2J7inrV82ej8baoY3FTcGeusN5e6WNEZMtzOdE8/WY="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30="; + vendorHash = "sha256-abhoGqxM+2wiWPjZaGMDQnD9r60+E0aXTrH7J5r5prk="; # 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..9be5204d9c96f 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 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 cd37da1af6508..ab481ba74cb3e 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.83.0"; + version = "1.85.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FIl+SWYK8+OLuynhma7IG2fozekhGZKK/t5RgD+eTtA="; + sha256 = "sha256-nIW7Wt4mThxjnHHF+rD6q9vZ7KsB//nSpkWtkiTo16Y="; }; - vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E="; + vendorHash = "sha256-swQN0WjVfLo/LjZrvjX46CnfBGnrVzLj8Cv4IP0eL7Y="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 7bce32ce2c0a6..d5afb172885b0 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.1"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; + hash = "sha256-IQGDuxk3ZDtrY/RLp2DfdCWtBNMTYPOitcVCcxH7HoY="; }; - vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; + vendorHash = "sha256-F44n+n9jfGYBQC1I33ylp8ZJtMi+uzjOLeG+5MbVePs="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 3de93c9369eda..603513a71f163 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.11"; + version = "0.16.14"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-muIVjT6ssNejp5O8ju06h9e7ZVcfwXyHgQIa0IEP4Xg="; + hash = "sha256-VYfLy0vR3ON29EHUx1R2jF61+DbxH2RUsUQXFgxjMUU="; }; vendorHash = null; 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/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index e1bbb48ea9655..936ed7ec73ca2 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.7.11"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0="; + sha256 = "sha256-7FYIJf9vNHK9u8r7HVpPtGGWwRA5cdrB9f1Vz1iTFjI="; }; - vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw="; + vendorHash = "sha256-9SpmMXmocwaZH4fqqETzmRP6wvI2NV/LL6M0Ld4lvso="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 4cdb78db4fd71..03188bd6eeca9 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-CqUAySELc9jMQD6+BCgnvajEDv8FjU4Ita7v0EFrPug="; + hash = "sha256-ziW+ROuUmrgsIWHXKL2Yw+9gC6VgE/7Ri3zc3sveyU8="; }; vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; 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/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/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 6f74be61c4078..a695f261ef62f 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -41,6 +41,6 @@ buildGoModule rec { mainProgram = "glooctl"; homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; 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..e02525e48f0a7 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -125,6 +125,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 +159,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..058ad004a2171 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.15.2"; + version = "3.15.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-gZfL9ejW9Md5X1S8Zvlc4OpywJfU2rlT+p78imgPjpw="; + sha256 = "sha256-m5k1MUncx9xSGu49Qjy1MByl3h6Qz7VCNrveqRVjtdQ="; }; vendorHash = "sha256-2q5IziYSW2FFfRZvWKz6dVnJfauRlE9lRrb4/l2EGC0="; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 0b97512e59c1b..ec4073cf251a6 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.8"; + version = "3.9.9"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-HGQTnvtL9hksy0B9U6jK8kkyoc3g0lmuBRV3vsg9Yao="; + hash = "sha256-2vippOY56eP+dMTvH3E+pesq03SHnIsNaRwHK8rdIus="; }; - vendorHash = "sha256-4bYepEVeVg+X0WicktE8BorwgsLGh2cZUn8rgfMExpk="; + vendorHash = "sha256-Xfev2TsAtP9XddAUNCCKOeIFpKLnD00SdkH2io2REQk="; 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 f05b0e54bf00f..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.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XM51pbi3BZWzdGEiQAbGlZcMJYjLEeIiexqlmSR0+AI="; + sha256 = "sha256-o9y1C4O1uG2Z7f3kCEoK1tSmSuQh1zJxB/CZBv/GPus="; }; nativeBuildInputs = [ makeWrapper ]; 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/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index a541f60a18ed5..5588fbdeb6a2d 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.167.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-fXrfthjWaCo0p7NwP9EWa0uFeCCHInzi7h2tgawHlh0="; + hash = "sha256-a3HkpnO54NtaYhQsCXye2aWKhMq8mRj1nnevwK/4RZs="; }; - vendorHash = "sha256-nWfj/E3Lg58wZ27LEI91+Ns9lj+unK6xYTEcxdAFOXI="; + vendorHash = "sha256-2d0B/qq0uERCFgTJDxvhc2FWQ/ffODbD1Z6aFWHX0Ew="; + + 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 c853fb2dc0a9f..9609e87e32d9d 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.2"; + version = "1.22.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-tw9G7VhrBMdSbZ4ZZgMlKEDfhZE5dSPd2HUgfkDA8vo="; + hash = "sha256-rtvuGIcjarIc4PmBXM3s/XbMQp/wlU1FhHb1lmXE2go="; }; - vendorHash = "sha256-Fso55G5j8MUQSqhCr6BT8epwgV1NznQXkPPQFL9TZFw="; + vendorHash = "sha256-0F4GIOT/YUzLLhD9HzNJpGSgfMALiEPAb4vtmLmI+Qs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 7fe23d3709200..9d71c20707082 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.154"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI="; + sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix index 2731e237d45fa..933a3342004a2 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.2"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYwuDPkxhtQy989XW+DcI5NJPhfLP07mYUFc180Sdw="; + hash = "sha256-dZ3G5zucGeFl1ooNJ7mUpgtv99ZZgOk5deHNUtP7vt0="; }; - 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..76bcc7ee7e0a3 --- /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.11%2Bk3s2/k3s-airgap-images-amd64.tar.zst", + "sha256": "199nxfxwr52cddk2ljchhxaigyi0al3lzyc0jy2am4aljlm0jivy" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm.tar.zst", + "sha256": "02riiiwwr0h3zhlxxmjn5p8ws354rr2gk44x3kz9d7sxqn17sz4w" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-airgap-images-arm64.tar.zst", + "sha256": "0bs9wj33appb9xpsb2v1xz4xck4qq6g74flnc0mxf9warwr4988r" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s2/k3s-images.txt", + "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index b75eb6296138e..2312cc22cbe9c 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,9 +1,10 @@ { - k3sVersion = "1.28.11+k3s1"; - k3sCommit = "617b0e84f419e37ba995c6dec06ccfbb24bd649c"; - k3sRepoSha256 = "04pmg0qx1sidpkv72vllmnk82v4fg490gvppp79m3jc931v059w9"; - k3sVendorHash = "sha256-6uCzObYCIETT/aswsHR9hOzUPNZe8GJbLWfNqOKWyag="; + k3sVersion = "1.28.11+k3s2"; + k3sCommit = "d076d9a78cb835279a04f12c816ff4404884862e"; + k3sRepoSha256 = "1k1k3qmxc7n2h2i0g52ad4gnpq0qrvxnl7p2y0g9dss1ancgqwsd"; + k3sVendorHash = "sha256-tzcMcsTmY8lG+9EyYkzYJm1YU/8tGpxpH7oZ4Jl/yNU="; chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.4.0-k3s2"; 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..fdf9d967d5162 --- /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.6%2Bk3s2/k3s-airgap-images-amd64.tar.zst", + "sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm.tar.zst", + "sha256": "07c085y5qy8h5ja2ms3np61d7wkp6gic82snx70qlsm5fm3ak3z7" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-airgap-images-arm64.tar.zst", + "sha256": "0ljajvz0n0mmwkdl1rwpwqmhgxqivakdpfyaqsascdzfk0qpv5gp" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.6%2Bk3s2/k3s-images.txt", + "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 6e07b2658c004..4b05d0a07f729 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,9 +1,10 @@ { - k3sVersion = "1.29.6+k3s1"; - k3sCommit = "83ae095ab9197f168a6bd3f6bd355f89bce39a9c"; - k3sRepoSha256 = "0gv7xh08mhgc2cyzpsvdi69xknifcpdy6znbim6r3r4lbcw2bkl9"; - k3sVendorHash = "sha256-OiZLUjQUCwso+NHg3aOrXx6/HSFOfwtzwVmLr/Fjfpw="; + k3sVersion = "1.29.6+k3s2"; + k3sCommit = "b4b156d9d14eeb475e789718b3a6b78aba00019e"; + k3sRepoSha256 = "0wagfh4vbvyi62np6zx7b4p6myn0xavw691y78rnbl32jckiy14f"; + k3sVendorHash = "sha256-o36gf3q7Vv+RoY681cL44rU2QFrdFW3EbRpw3dLcVTI="; chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; 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..1d4819006cb25 --- /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.2%2Bk3s2/k3s-airgap-images-amd64.tar.zst", + "sha256": "1d1adpjxxgkflm4xqzynsib67pga85r1qmhkhh540nl0rppbq7gr" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm.tar.zst", + "sha256": "1hjhlj4b5ddaqhpmqbbvhvgzryi5j84i8bmpl3yij87yjkz3kld7" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-airgap-images-arm64.tar.zst", + "sha256": "1r9rd70qp8x57j3hdpgwgkzchykphw0x4yd8c1jwjfaqm5df1w0d" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.2%2Bk3s2/k3s-images.txt", + "sha256": "0245zra2h8756kq2v8nwl6gji749xlvy1y1bkab8vz5b0vpqhfxy" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23a3021875752..2646c3454136e 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.2+k3s2"; + k3sCommit = "faeaf1b01b2a708a46cae2a67c1b4d381ee1ba6b"; + k3sRepoSha256 = "0hy0f44hj5n5nscr0p52dbklvj2ki2vs7k0cgh1r8xlg4p6fn1b0"; + k3sVendorHash = "sha256-Mj9Q3TgqZoJluG4/nyuw2WHnB3OJ+/mlV7duzWt1B1A="; chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1"; + containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 52754219efbfd..e0288c21fc997 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.isAarch64 then + imagesVersions.${findImagesArchive "arm64"} + else if stdenv.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 @@ -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/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md new file mode 100644 index 0000000000000..9c2365d6f2dd0 --- /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: superherointj, 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/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..9eab8ce08f81f 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 @@ -105,6 +123,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/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/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index 6c61899e7d5be..61ba6863e6182 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.0"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - hash = "sha256-1sAkNueP8qGwPwdX0oSJfB/oGvna6+G8Cay+3vGJ2IE="; + hash = "sha256-tZnHkjsAT8AOIpVDIiHnD6k/2S/S/+jM9uw18TaYJaA="; }; - vendorHash = "sha256-iv0OJLhIZpdem2/JFirJnvmU44ylTomgB8UqCGqHbwA="; + vendorHash = "sha256-5lA7I/vrc6+XsiSCL61a/p7jbseLcJyXnOC5R/z85vQ="; 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..ad185bd853f52 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.0"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-H+jPHf7sMrMlqLWa3L34U8nbBgqeX+MqChiuSsVdx6A="; + hash = "sha256-tEeqenOJVpwFGBS3iYlVdedNo02NV9/jtGsgrquV+0I="; }; - 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..dceb843ac72b7 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.1.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-JG2Wrq6fCE1zJmM7kXcEHIQVxv9eKV0Zy3ev5eY7Dv4="; + hash = "sha256-CaDGl8+gIbcUH+bxqye+XEFO7ZwFE7NGZmyrqn7vzTk="; }; - vendorHash = "sha256-g9QjalRLc2NUsyd7Do1PWw9oD9ATuJGMRaqSaC6AcD0="; + vendorHash = "sha256-8f37IPO9PsYA/oHCtIjVrUgOTkXzkHv4cGTy5bUQP8s="; subPackages = ["cmd"]; 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..5fd38f78ae606 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.23.3"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-/h2hvyjC/rHOkyZbt0kYn0TcQeXutU4rxYBD7Mh948Q="; + hash = "sha256-78XvVPWhsvu7shbU2fJ+/7NnGxUXLLOeR28OPkUUw2A="; }; - vendorHash = "sha256-MY4yU0UpN3V3RxsFWqxZOsZZA1kma3NNTHE9e/gquno="; + vendorHash = "sha256-Y5HmoxMLs2rvpLycH5bMd9awHrNeIOkwn7m53hCAWug="; 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-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-view-secret/default.nix b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix index 7f22523e46bcd..5dbc4513a9f07 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.12.1"; src = fetchFromGitHub { owner = "elsesiy"; repo = pname; rev = "v${version}"; - hash = "sha256-5X5rOoERx6HoG3cOBpYm12anMXXDjTtHZzQOOlJeJSs="; + hash = "sha256-0/gz3fquqZCRbHQrBBLXs2rwQPkyktEcBMQ46GfMauo="; }; - vendorHash = "sha256-oQvmS05nev+ypfkKAlTN+JbzPux5iAzHsojW8SxtB70="; + vendorHash = "sha256-OJboCLa+ntKOhmQ9zs5aF/mio5OFsr/f/IS0PAwAi6U="; subPackages = [ "./cmd/" ]; 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/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index 6a96666829615..17822e687f7ef 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.28.2"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFEFvWizQeQp9VE1guO9xMZl9+cFk6jV43TVCbD8pas="; + sha256 = "sha256-hWGP3/WAS2+/jylytZWo7+N/bWmrkaJDHZ0tYbElLSs="; }; subPackages = ["."]; - vendorHash = "sha256-Mel9fH13iXSpB2kClJsH0SM+/gIzu2rPt2q0fjQwumw="; + vendorHash = "sha256-r9WaS3J0b2yerjOgVLu0g95fwETqOFWoUvSC30gDzH0="; # 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..e9f39806e939a 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-BYfnHgTiHMmKdW25XymP2nDYQDOEHSIUOjrtwaoc1JU="; + hash = "sha256-P/x6HigXnAhpUnycm9B8TO33hdPzREiM8kwL+/GedZY="; }; vendorHash = "sha256-tAThtZJ5DRzveJRG58VPxJWrZjB+dnXhX/50lZEHUGc="; 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..f49e966d742f6 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.73"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; + hash = "sha256-fhdHgkIsvB7cR5kCkvfzJuxrAVYvB4Y6NCGJpHolriA="; }; - vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; + vendorHash = "sha256-b3Aq3970E19jOJPjw/e0ly1W9x9HiDN+bfuB4uP09BY="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 66164211131fd..633c7df45c8ce 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.1"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-b3qQ3lFaQvkmP3HYPwQi2TxSeKmWzGbp01OCnjULJ4k="; + hash = "sha256-k4XqFwpHlm6BmFORqc1IFGqbfLYqtHwLM2eSF3JV+0M="; }; - vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0="; + vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index c36bab57344fe..c6402dbb103ba 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.17.0"; + version = "0.18.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-jU/w4SA6gt2xCdJiSNkY2S2RQCuyj84IW1w8DDPvtW0="; + sha256 = "sha256-wTnBMNgwHqK8PdpEa3RAsVJemnGw/ymn6GJciPFsYrU="; }; - vendorHash = "sha256-OXmT7GTnD/TKjCN4po3vLJ0pZgsEEUGnuF5RtOm00hM="; + vendorHash = "sha256-RKQM1JxyZA1HwqRjCULY4X3jZK9SgclW55/qXp395cQ="; 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/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index e82cde01ec20f..518037d60706f 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.7.5"; + sha256 = "03hsz87vpysw4y45afsbr3amkrqnank1zcclfh6qj0yf98ymxxbn"; + vendorHash = "sha256-0NKoQICbKM3UA62LNySqu5pS2bPuuEfmOEukxB/6Ges="; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index bb57bae66021d..6a01cb5134cd4 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; + hash = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; }; propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 75902de1b9f6b..5cbd49e2f5621 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -12,6 +12,7 @@ let nixopsContextBase = this: { python = python3.override { + self = this.python; packageOverrides = self: super: { nixops = self.callPackage ./unwrapped.nix { }; } // (this.plugins self super); 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/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/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..66403998d835a 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.2"; + sha256 = "sha256-deVLC7yGgLHCauq+3h0Uu5ln5omoeV8/FkVtQM9CEXc="; + vendorHash = "sha256-Pr38tRzym8UFPZKs9367xOZJ9P5OHotwwClorcSgOys="; 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..911a3fa2d87c9 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.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-9ccWH0bh67LCwzKmyaE32j+qeKfNauclSMjpRwdblH8="; + hash = "sha256-2jm9FoB8CPvnqJABotPhlvJdgZTtuvntzqWmQ2Li7W4="; }; - vendorHash = "sha256-Vt2yUYm2i1NHzW7GxDRqBpaFS4dLfODNEMPO+CTwrLY="; + vendorHash = "sha256-m9gCsWvZ55Wv8PFV3x+tjlEZ4oDFVBbOSnvsjPTvR6k="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 39020d87d9991..2ac931ba414bf 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; diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 5125f318ee007..74d5fd9b30f20 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.1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-g0aMpSENMKHCyKyB2Lhq9XjH9GIx7l4/Sz9GDXmzUqU="; + hash = "sha256-mMp3X2jXBQi/lRbqdiBa1UMYPKXl4jEvTHXxbPji5D8="; }; - 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..e40e97c9d7446 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.10.2"; + version = "2.10.6"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-5Q3T4yusnJVHU8QdXxbDuePToGp+hu+GnwqD7TG/0Rw="; + hash = "sha256-kn2vpc+KcIQXZgSbGf1aAANQ/OW807jhGpVZbfwcFMM="; }; vendorHash = "sha256-NShVyjNyG06cLmt8rd71lFLvkd8KRWQjj6xUCx7NgSk="; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 9936580f3cc22..7c6147fb21a0a 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"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-PhP3ILOYv+7gmxOJLCgIYp+1FIJirZo7TZJoZv8A1WM="; + hash = "sha256-OoWeyt1lZ3ivo1uSOTwzGJranf6fGYJGjHXIDItg6yc="; }; - vendorHash = "sha256-EVlYhlEXwgUfRaxAJ3dBTz6MJ2QITZtnHVcQQN1cHbk="; + vendorHash = "sha256-AVFMUO/5OUqO4zPH53FHWldfRrmHK3Oj+De78m+yhpE="; ldflags = [ "-w" "-s" 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/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 285108834c1e7..58a9d6c629ea8 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; diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix index c1b2695fd9d7a..9cf3dfe955d73 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.30.3+rke2r1"; + rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; + rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; + rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; + k8sVersion = "v1.30.3"; + k8sImageTag = "v1.30.3-rke2r1-build20240717"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.30.1-rke2r1"; - golangVersion = "go1.22.2"; + ccmVersion = "v1.29.3-build20240515"; + dockerizedVersion = "v1.30.3-dev."; + golangVersion = "go1.22.5"; eol = "2025-06-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix index 0fd4279226fef..58b0eb57b80c5 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.28.11+rke2r1"; + rke2RepoSha256 = "1mkl7mnlsq2j9n610jnr9545hq6ilr5sdg8jxjxjbk9lnmmbvrm1"; + rke2Commit = "6b12d7a783238b72da8450fa1b6ec587cebb79ed"; + rke2VendorHash = "sha256-VenNSaa86nbhrFYzXPbj0fxbDlrIu6pxqMo+HPDuUxs="; + k8sVersion = "v1.28.11"; + k8sImageTag = "v1.28.11-rke2r1-build20240619"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.28.10-rke2r1"; - golangVersion = "go1.21.9"; + ccmVersion = "v1.29.3-build20240515"; + dockerizedVersion = "v1.28.11-rke2r1"; + golangVersion = "go1.21.11"; eol = "2024-10-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix index c0447324a1122..1ba579e917ed8 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.30.3-rc5+rke2r1"; + rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70"; + rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c"; + rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0="; + k8sVersion = "v1.30.3"; + k8sImageTag = "v1.30.3-rke2r1-build20240717"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.30.1-rc3-rke2r1"; - golangVersion = "go1.22.2"; + ccmVersion = "v1.29.3-build20240515"; + dockerizedVersion = "v1.30.3-dev."; + golangVersion = "go1.22.5"; eol = "2025-06-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 6584230191567..bcfbf11b0d15c 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.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-1eu7khgs6nzp+d1Gtz2DggD2Gie08auw1XxSZsnRdaM="; + sha256 = "sha256-DX7q8TgCJuM4G/gYnh+ZhbaGFO4BezRShZyNqZ2VRMg="; }; - vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; + vendorHash = "sha256-K1jtwrfzRpzMApDW0WPmIZaJ5hADlMjEkFDWFmzmDc0="; nativeBuildInputs = [ installShellFiles ]; 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/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 4bf6a34f1c0bd..e25092409c6f1 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 = "0.13.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2zk+B+GomLZwep5LNRpWJj8JjFC0OxAl1XhAv+8b2kc="; + hash = "sha256-bh0UsXA5yHtvP9femOwEzVzmu1VLz2uZwoIHL/kI7kM="; }; - vendorHash = "sha256-NLteuVOswIw2ModdE0Ak4XmApkHLoYDt6SDAZGsgwBk="; + vendorHash = "sha256-ziCJG722c32QAh9QmoC2E7TcLiC2InKwfdC9mkanTsU="; inherit overrideModAttrs; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 3b23b750864cf..1b81c59e713b4 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -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 df4457de8e548..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: -buildGoModule rec { - pname = "terraform-docs"; - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "terraform-docs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-XZS+mGp2QsrKS3fPZd0ja4w/CAfPcyzSgwolQ+StER0="; - }; - - vendorHash = "sha256-aweKTHQBYYqSp8CymwhnVv1WNQ7cZ1/bJNz7DSo7PKc="; - - 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-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9b613c6ff4ae8..02865985be101 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-LlpPc3um4D2nNJFZRoXnw5ss0E0rrJN0wKKmuV0S6NU=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.23.2", + "rev": "v2.24.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-RZmT31fetR46vFQRoLkBjadD6ROqvElI/jOZnf6FWTU=" + "vendorHash": "sha256-ptZ14WWarYeKT8gIcUDi4LmCFkpoTwAhSwMXmLPlWxs=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-PCtWQP2FsYl5OITVCUp6OJub0uXDLJebWP310F4KWU8=", + "hash": "sha256-X3KtT4Thsf7bYeZJEUphRiXAlNamabFE0rjS636dJSY=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.19.1", + "rev": "v4.20.0", "spdx": "MIT", - "vendorHash": "sha256-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" + "vendorHash": "sha256-QzbtTp78tROVj8kPYzjP5kBRHASlvqK6xpmRnJF6jsw=" }, "akamai": { "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", @@ -45,11 +45,11 @@ "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" }, "alicloud": { - "hash": "sha256-x/hq45iqcKurjFeXsdycWqDlJ+O1/4f01+6ay6TDejY=", + "hash": "sha256-WaMvv/NqyblA2rrauZ7p4pHCND6S6/kfBKS/2xIrcjI=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.225.1", + "rev": "v1.226.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -81,13 +81,13 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-4gE8+z4GZElmkVK9nVDriAolXJ95arNNKyIq88XAwp8=", + "hash": "sha256-j9TtO8dJltf7SZdlMZaiCWdJbcEPloPbDhYfWcCzgss=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.0.0", + "rev": "v11.1.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-5kdyDc3/jBvg6QNBivh8J4SrYgMd0dkiUHUx43wzepQ=" + "vendorHash": "sha256-nPEN1ee0RmNpgKIlz0jHcHkG6oYZn7LV/Gmmdd9krq8=" }, "auth0": { "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", @@ -117,29 +117,29 @@ "vendorHash": null }, "aws": { - "hash": "sha256-YykNKCDFPQCtES2vAbCbqbHbkx1EmVM0bTEylr84bqs=", + "hash": "sha256-DJ0mfqcWIs1iLSEfhlYEgHr1PKz8HchlgvHfEwIAnlA=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.43.0", + "rev": "v5.57.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" + "vendorHash": "sha256-NlFP7cRE+6PiGMSz2y/SDQas/TNWAJk/EBEqIeG2INY=" }, "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-3EHm4fpeYJYzwrwaQLMdgFq1dgmV755WwAhKBG3f10M=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.109.0", + "rev": "v3.111.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -179,6 +179,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, + "bitwarden": { + "hash": "sha256-+zuKZBwoOSp3HIdxmK1FInE33/1D5nX2N7zYBCtRvHA=", + "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", + "owner": "maxlaverse", + "repo": "terraform-provider-bitwarden", + "rev": "v0.8.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-u9ICJtPZveRrK5BOthvFDGkNcUiA0/Hb39KM0eIhUVI=" + }, "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-QS+JCFLYPvxwLIVzCS/gKZkBZQhOOxRfn7Vudgiox+E=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MIT", - "vendorHash": "sha256-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" + "vendorHash": "sha256-gTJakGr9f9bzR5pbmgAMTJL54e2mS/h92TM4ft3ABdw=" }, "checkly": { - "hash": "sha256-xM3KJiWO1Lsw33talLR6gcalEm9gRffUOikdUQZ6AsM=", + "hash": "sha256-qPlXaw8J2J7DPKJvfiTLalgMIWpttqbdMg2UB3rvt14=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.8", + "rev": "v1.8.0", "spdx": null, - "vendorHash": "sha256-TgoTz9kFLhikfQYt654nmoGPzjVLfUMnUrs3mVqrgJo=" + "vendorHash": "sha256-+GirqFNV0eIC9CzpW53UOi9cDUzXs8ozSLX7dKQnOQ8=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -290,13 +299,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-L6GXoyjTd2n2n79gPvmQ0zLhW0iDS8ZcrY1gxPaQ61I=", + "hash": "sha256-sWcVMQiSRFyjwYIHUdKQm9sKX279pnA3FVLwUJ3kBKw=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.39.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jK6GI44o1FoJw9eZaCbWz1zw3dHqyaS5664h+Z27OXQ=" + "vendorHash": "sha256-GEZmpCyqZCxsS5aFxEznNscs5CcgQiiPvJweA3mKkRY=" }, "dexidp": { "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", @@ -381,13 +390,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-jnV8dg9CJ38YKdEmc0hxDDbl/YUQgPTM6D5YYVjjWFc=", + "hash": "sha256-Ipl+POTZRKe9xKR08x/TPm2S7kv6w54im16pp56rWDE=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.38.1", + "rev": "v2.0.1", "spdx": "MIT", - "vendorHash": "sha256-25kuUGbBCHOL3RzQcLDzzdfQ1j+XvqJSEyIowV0Od8A=" + "vendorHash": "sha256-oxtFq1tejyqsY2uEkMjiub1CwdkFpuSVRb1Z2u3CebQ=" }, "exoscale": { "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", @@ -408,11 +417,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-xoxxicu0bXoaISMNwZNM6G8bBz0GKv48ORpcABwSsg8=", + "hash": "sha256-FfdXMrGfz+JFEyWfZytIt1R0M/v7JUmkvu4VohF1vSA=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -453,31 +462,31 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-WquY33Dx5E+OgnAMZ6dhgwrixhHhAYRUa4l6TuzGzmw=", + "hash": "sha256-F73eY0m+KdzfAFCFPOZ0a29OOfgOm87WZvi8+mHwPek=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.10.0", + "rev": "v17.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" + "vendorHash": "sha256-FrmQsuLinm5Z4+GHC1PV19lt1rfxv3TwQiEUxTvlTtk=" }, "google": { - "hash": "sha256-YonRToq/xdUy584hlzG+0/olYPhq3yxBUEahGz1ODkk=", + "hash": "sha256-RJ01+OA3BXMNThRk9aGkYa2jrj3SYgOh9eA5al5wR/Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.35.0", + "rev": "v5.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" + "vendorHash": "sha256-0SxftrOjmpYK4ud3RweYaW6qgdKwi43D1ZhN470rvVs=" }, "google-beta": { - "hash": "sha256-71eEmUUwSGM81kNwzvJ1QnkjMskdRx8BoETNSLIjYog=", + "hash": "sha256-r9ndcNxiocRHH++zvEtuIwJ8U2fE5cgndPcYjdhLpEA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.35.0", + "rev": "v5.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2sqUzK8yxNKdfvrToCQWK8Eyr2n4ch6/KrrIAYmLwcA=" + "vendorHash": "sha256-XkpLgFB/974WEbZe34uKrLSEWjinrkmpOFOG7uYDHhg=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -570,11 +579,11 @@ "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" }, "huaweicloud": { - "hash": "sha256-04y0G3555aRnB3Zc9TgeYOMo1QyJ9ns4r85AikXSNE4=", + "hash": "sha256-p5vS7rnoBqE81Dhj35xeAs5ja/ekpeVEaNALtxw0/Tc=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.65.2", + "rev": "v1.66.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -597,13 +606,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-5esd44JgaarCJK38QyYv+fxMz0+zzivMZD8rqyqrdbo=", + "hash": "sha256-91EXK/8Kovq2yqyF5lFgWV/AJMvU6eHCnIBnLpzsQws=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.64.0", + "rev": "v1.67.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-YFxD7hvKTXdaQ/+/Oiws/i6TipbFaAQ0Ah1arGK7JUo=" + "vendorHash": "sha256-ioyfsNgXoQOtzU1eBJkjMw4hgIo5ryFPIFKqOdn4fuk=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -705,13 +714,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-6q1x34SWBCDi1jGoyNoxMAtHqxqP3qAVk1MLMLIRbg8=", + "hash": "sha256-X7Uslu8HjJg/Ikz48hg1aIaDNNcr3Xz4gBTPB+y949k=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.23.0", + "rev": "v2.23.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZQkFp9UXhY61YgtPVaWOSoQIYNcaTs9V/iwZ+UDRluA=" + "vendorHash": "sha256-lQ1+MVErv0g2Q7PSrO95Qzs0o/0hpL6JKK9E5J1EGic=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -786,13 +795,13 @@ "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-TitX99F/jx2q2FOSmJAGLprhFSsG4CBdmKQhzNqxotk=", + "hash": "sha256-8A2csdDMS5W0SzVRy7QATWUEDEZqR7gLRDpVAeROsZk=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.17.2", + "rev": "v1.17.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-Te8Kd+1B3T3Ngo+xKgiqjnm5CZ2QRNXEQxPlaLPXNRY=" + "vendorHash": "sha256-idXan9/OGEKY+VT2dwWwj+P1fFQIrIs2ghkthz53j/g=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -813,13 +822,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-UxSWEejkEH5VzPWXc2RZ5ho8rtvwH6zYUEP+W/r4ny0=", + "hash": "sha256-hJKYz95+i1j1KhDuh5Jcm8cZzBAD3cK5+a5B1vCYBXM=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.38.1", + "rev": "v3.39.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" + "vendorHash": "sha256-EHO78DEZ92WRDP8ZA0M9zdZ8KsPWMA2ljgFY6dX29YM=" }, "nomad": { "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", @@ -831,13 +840,13 @@ "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { - "hash": "sha256-KbtMwLgwCPHilzQ22oco99q6c5+0B/9OXoc0IZXLLVk=", + "hash": "sha256-96q68P+d7K4UycCZ0Z5w3HWIcKwsC4/UD6WPU6yyC7M=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.3.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-kQFlW6G20x1OJNywb+KfJC1A7XSdgHlif7/szUOBuhs=" + "vendorHash": "sha256-0RRZF7/NHo9y7SUKZbq8nNU+gFdCb0u4XJgsobNeWsk=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -859,11 +868,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-EcemPlqHB3Ggra0o1rzjxAGtcpBKpUp3/H8zS56COYA=", + "hash": "sha256-yiHBWcOE2QxyhzKqjSPvgqAFu0hL13idWXbwkhAhNeE=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.46.0", + "rev": "v6.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -940,11 +949,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-GB2U+JBMAj+ePay7CYHWv/daLzVm+V+5YoADJ6uQp+E=", + "hash": "sha256-sXFRN05mn5hMIqxhwIvYWlMgkrUGZqi+J29Sq9GRS90=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.14.3", + "rev": "v3.14.5", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1138,13 +1147,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-6bdOwmAKxP7EVdRV8vw6b/lewPm35zE9T0Dah6NL5FA=", + "hash": "sha256-SOzaTZIBEC9se942ofYHURH8btw38upJtnlDDWmLcTM=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.178.0", + "rev": "v1.180.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-c6vs7FypPQybAzFAsTnOGVjVLhhmj6v2/O0FU1z6X0A=" + "vendorHash": "sha256-mgDWGimTq7AODC+ojipWUgCDKpC/EP/W8x8kbey05mQ=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1174,13 +1183,13 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-ei5BxMyrx4CyVYl81DUDxLdbjGJBiTZWiFylhUFTr0s=", + "hash": "sha256-LPJwJ6j/eZzOliHH7Ci49c5CqDckaqSm7ikLKTVhuew=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.30.1", + "rev": "v2.31.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" + "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", @@ -1201,20 +1210,20 @@ "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-ISx/kc3Mi/EBnzfrMojRTsZEG10iPqKMB8Ac8SzBZmY=", + "hash": "sha256-PIqsCdIaFob/C2b1Rem/JYl7bQVvdRecDQDkcAZutz0=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.8", + "rev": "v0.0.9", "spdx": "MPL-2.0", - "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" + "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, "tencentcloud": { - "hash": "sha256-RR7F+sZl/btVEsybmKFxG3yrE7PkvdstMuDAJwx4Ggk=", + "hash": "sha256-PZWBVLUfWn13B7saz2XecMv6pWWqPMOfBzqr2pErnvs=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.105", + "rev": "v1.81.107", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1301,13 +1310,13 @@ "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" }, "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 +1355,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-BCEUFIw47o7lFmOaQ/SBk2n1bPnvzAwdxeuuMNx4OgA=", + "hash": "sha256-rF7gtZUPse6ewcawmxlIfCmVRKKNJMUwqVVEBaLvLbE=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.8.1", + "rev": "v2.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" + "vendorHash": "sha256-TxaYIJtEIgy0Q56Gk1JXqIUuVyVJNVH0gKmdzzDWW/E=" }, "vultr": { "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", @@ -1373,12 +1382,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-PTlnXq30roG1ueLJM5aGSeuDJ5zukmU33T9Qf7cnxd8=", + "hash": "sha256-FwwjHWwUUtOwZZh0YeUbSnSLFH1Q80ALFHhd0tCAZNQ=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.122.0", + "rev": "v0.123.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Lo847kKBWDFeN3t7T/akaQ8gkU7b+p1BSSi4ddLLDyc=" + "vendorHash": "sha256-K6Khgg9sAG2S/onFUlVG5mZfMtvpvVJeU6YQOyA4Liw=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 14bd84533894d..59f4f30e25683 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.4"; + hash = "sha256-RCjeKdxrnCmOtUQfBC5/gM+FB6YHbc/V1cmVxNCVf20="; + vendorHash = "sha256-FnjCJilPuhYs/JTuEyb4Grn4t40Ox2uqwQf2h9B227Q="; 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/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..c9595ce183d7b 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.4"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; + sha256 = "sha256-/wkCd73SrspHccbOZV6lq0Htk+Vjgbu2uTZLiEeZAdc="; }; - 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 58fac193dd2d6..965a5a5c9a75c 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,10 +1,10 @@ { lib -, buildGo122Module +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGo122Module rec { +buildGoModule rec { pname = "timoni"; version = "0.22.0"; 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/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index 294440d820e1d..39e8958d1242d 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -1,9 +1,7 @@ -{ bash -, coreutils +{ coreutils , fetchFromGitHub , lib , python39 -, substituteAll }: let 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..8e74c75646831 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.35.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-o3sfvzUCCW7hwNDrWH1IiRyZHkVnxffJdLS8BqzD5Ng="; + hash = "sha256-HxHINy+zwkwLvckQUoDy1KqLhTYSH371+cucQGWJNIw="; }; - vendorHash = "sha256-Co9xKC7J0WGoaYxa+YukrP+6aOuhweZyXaH5wD97ioA="; + vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w="; 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/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 2f4db7dcd5c16..b98e308f6b726 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.7"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-cnxNIFf0zCpbUg9G+bHNoApxB31O7RH5BVgprYN2GYk="; + hash = "sha256-ZWM45RoGfGd9mRQkQ/Hz7MGlYq4X26J/QV7FWDjMVrk="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-IVmz+2pWHsiZOhHKEK9GW9zZq8m1IH5lpfKeClnmc3o="; + vendorHash = "sha256-KSBoqp56n/b9zk5elEWsv7EAv3oyVhmc7hjyudicTWs="; 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 index fb1b9546363ce..fe6e645840f86 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.38.1"; + version = "1.39.4"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-9n8XAeSZn2HD8Vg2B8YmBUQ+VPBglgjN+QjrSOgn65Y="; + hash = "sha256-VNli6MtE2/JC+H5zPdwjefxrV85bOJrYKOlpFH524U8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-2lR2/jHOFmKm3s+EPNRFLlgJHIs+33YDt1YeHBWRin0="; + vendorHash = "sha256-CuJbkRezv0nL6UlB8Qg1G3gVhBM1EtvxDxN53E/Mib8="; postInstall = '' installShellCompletion --cmd deck \ 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/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 8a0f00e73953d..d1427b48271dc 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.2"; + version = "4.12.5"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-t9cjF5gCRIv5WvGvYTGOFYGRKTJGOvJ3xfhXk+lmAF8="; + hash = "sha256-xNbCKRAHs9xiZMLbsV6vcu8ga7WaGqZ+Dg4itTmRRr4="; }; - vendorHash = "sha256-KqsMD0WbFDZwVqsIvg0LfOhcEO7oZw7v5XJwyDj9wxw="; + vendorHash = "sha256-Zq/98A3FiOPySXqY83rboC39cLcwrk6AvBk8+XIPrT8="; 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/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 930fc34603192..d9da9e48c7fbc 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 @@ -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/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 68d085655d13e..2e8ac457cceeb 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.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -113,7 +113,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -125,8 +125,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[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,6 +141,7 @@ dependencies = [ "rust-embed", "thiserror", "tokio", + "unic-emoji-char", "url", ] @@ -165,12 +165,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 +182,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.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "brotli", "flate2", @@ -227,9 +227,9 @@ 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", "cfg-if", @@ -246,12 +246,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", @@ -279,7 +279,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", @@ -294,14 +294,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[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", "async-lock", @@ -323,13 +323,13 @@ 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.66", + "syn 2.0.70", ] [[package]] @@ -369,9 +369,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", @@ -396,9 +396,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 +421,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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "block" @@ -508,9 +508,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 +520,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -554,7 +554,7 @@ version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -574,9 +574,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "907d8581360765417f8f2e0e7d602733bbed60156b4465b7617243689ef9b83d" dependencies = [ "jobserver", "libc", @@ -601,9 +601,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 +616,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -633,7 +633,7 @@ name = "clapper" version = "0.1.0" source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "clapper-sys", "gio", "glib", @@ -646,7 +646,7 @@ name = "clapper-gtk" version = "0.1.0" source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "clapper", "clapper-gtk-sys", "gdk4", @@ -725,9 +725,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 +736,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", @@ -845,6 +845,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.70", +] + +[[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.70", +] + +[[package]] name = "data-encoding" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -895,9 +930,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.1.6" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" +checksum = "62d6dcd069e7b5fe49a302411f759d4cf1cf2c27fe798ef46fb8baefc053dd2b" dependencies = [ "bigdecimal", "chrono", @@ -916,21 +951,22 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.4" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" +checksum = "59de76a222c2b8059f789cbe07afbfd8deb8c31dd0bc2a21f85e256c1def8259" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[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 +975,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.70", ] [[package]] @@ -1008,10 +1044,24 @@ dependencies = [ ] [[package]] +name = "dsl_auto_type" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0892a17df262a24294c382f0d5997571006e7a4348b4327557c4ff1cd4a8bccc" +dependencies = [ + "darling", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.70", +] + +[[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" @@ -1043,14 +1093,14 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[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 +1108,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.70", ] [[package]] @@ -1094,20 +1144,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 +1155,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", ] @@ -1379,7 +1408,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1414,9 +1443,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", @@ -1426,9 +1455,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -1522,15 +1551,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.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -1546,9 +1575,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -1559,11 +1588,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1580,23 +1609,32 @@ dependencies = [ ] [[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.7" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1604,9 +1642,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1615,9 +1653,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", @@ -1626,9 +1664,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1685,9 +1723,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" +checksum = "080daaf35d22367a398aefd032af80cc36238c76fac7b8822894f5e5be073795" dependencies = [ "cfg-if", "futures-channel", @@ -1710,9 +1748,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" +checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" dependencies = [ "glib-sys", "gobject-sys", @@ -1750,7 +1788,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1820,7 +1858,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", @@ -1851,6 +1889,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" @@ -1965,12 +2009,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 +2022,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 +2034,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 +2053,23 @@ dependencies = [ ] [[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +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 +2087,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", @@ -2068,6 +2129,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" @@ -2160,7 +2227,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -2278,9 +2345,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 = "lebe" @@ -2349,7 +2416,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", ] @@ -2420,9 +2487,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", ] @@ -2584,9 +2651,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 +2666,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 +2693,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", @@ -2658,9 +2725,9 @@ 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", @@ -2679,16 +2746,16 @@ dependencies = [ [[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 +2806,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#10282a582b4d2fcd71c667d53355e68176e0bf62" dependencies = [ "article_scraper", "async-trait", "base64 0.22.1", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "chrono", "commafeed_api", @@ -2766,7 +2833,6 @@ dependencies = [ "mime", "mime_guess", "miniflux_api", - "moka", "nanohtml2text", "newsblur_api", "nextcloud_news_api", @@ -2807,6 +2873,7 @@ dependencies = [ "gettext-rs", "gio", "glib", + "glib-build-tools", "gsk4", "gtk4", "html2pango", @@ -2814,6 +2881,7 @@ dependencies = [ "libadwaita", "log", "log4rs", + "moka", "news-flash", "once_cell", "pango", @@ -2863,11 +2931,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 +2960,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 +2982,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -2952,7 +3020,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 +3061,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", ] @@ -3018,7 +3086,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", @@ -3035,7 +3103,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3103,9 +3171,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -3115,9 +3183,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -3151,7 +3219,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3221,7 +3289,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3238,9 +3306,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -3268,13 +3336,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -3310,9 +3378,9 @@ dependencies = [ [[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 +3401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -3494,9 +3562,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", @@ -3513,7 +3581,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3544,11 +3612,11 @@ checksum = "ca8049c74229f22d8cba889ee1d541b05da9c9668d8fe2011bb922250d0be148" [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3564,9 +3632,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", @@ -3576,9 +3644,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 +3655,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.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", "base64 0.22.1", @@ -3611,6 +3679,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3653,18 +3722,33 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" 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 +3757,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.70", "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", @@ -3716,7 +3800,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", @@ -3724,6 +3808,19 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.23.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-pemfile" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3740,6 +3837,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] +name = "rustls-webpki" +version = "0.102.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3794,7 +3902,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3819,9 +3927,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -3838,20 +3946,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3866,7 +3974,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4076,6 +4184,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 +4208,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -4099,9 +4219,9 @@ 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" [[package]] name = "system-configuration" @@ -4133,7 +4253,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.13", + "toml", "version-compare", ] @@ -4145,9 +4265,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[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" @@ -4189,22 +4309,22 @@ 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", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4272,9 +4392,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,9 +4407,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", @@ -4304,13 +4424,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.66", + "syn 2.0.70", ] [[package]] @@ -4324,6 +4444,17 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4350,26 +4481,14 @@ 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 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.15", ] [[package]] @@ -4383,19 +4502,6 @@ dependencies = [ [[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 0.5.40", -] - -[[package]] -name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" @@ -4407,15 +4513,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -4464,7 +4570,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -4515,6 +4621,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" @@ -4560,10 +4707,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 +4732,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", ] @@ -4661,7 +4814,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -4695,7 +4848,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4811,7 +4964,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]] @@ -4829,7 +4982,7 @@ 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]] @@ -4849,18 +5002,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 +5024,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 +5036,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 +5048,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 +5066,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 +5078,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 +5090,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,9 +5102,9 @@ 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" @@ -4964,9 +5117,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4993,12 +5146,12 @@ 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]] @@ -5035,9 +5188,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.2.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-executor", @@ -5050,7 +5203,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -5073,14 +5226,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "zvariant_utils", ] @@ -5096,6 +5249,12 @@ dependencies = [ ] [[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" @@ -5121,9 +5280,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", @@ -5135,14 +5294,14 @@ 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", "quote", - "syn 2.0.66", + "syn 2.0.70", "zvariant_utils", ] @@ -5154,5 +5313,5 @@ checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 779a811605b7a..4633f8686b014 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.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-s8h/OIJJzMmsCsaQJ0SOjCAVXfYQbjOupdDtLOqM9d0="; + hash = "sha256-caINK4tmDsP7AkLUBqbM96Po7sQxFOn/CAq62K+3aoE="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "article_scraper-2.1.0" = "sha256-0jDXH5kkX34tAWK+3hpmW1LWBsFksVgTnSuQX+XXVEM="; "clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0="; - "news-flash-2.3.0-alpha.0" = "sha256-ZgX6tQmPDMSpLcYD04u2ReQXdzeGzQTwGaUy/y4z4do="; + "news-flash-2.3.0-alpha.0" = "sha256-+CYU2CpF2WfSVjhLtLpHjdAGoycdhdbN9UucKO9XKiA="; "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/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix index aa0154227c1e8..832f888dcfaa8 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 }: diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index be76874b2fccf..0465fc31cf64d 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -11,7 +11,7 @@ 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="; diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 0743e7541d35b..308fd0c2e5af9 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.0"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-bCLMTWtgEay3fLKOFWUoWpOL1iGDHRR5hu+v06bLxLs="; + sha256 = "sha256-MaBYJLNVlDEsMlnyNtf8G8D1Tnvcfv0/bXQ/8f7kBao="; }; 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/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 4ecc4b0440559..e1b3c5fc46b0a 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.1"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc="; + hash = "sha256-Js5l6bVZtnR6uOo2+3L2CAvFj/i0O2FFGEiGOkc2qDQ="; }; - vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU="; + vendorHash = "sha256-4TTxhcP06YuhWWufVTAVK2wTf8mCc3WLAjzFe5wKChY="; 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..8048b87409c1d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,10 +1,12 @@ { callPackage , libsForQt5 +, python311 }: let mkGui = args: callPackage (import ./gui.nix (args)) { inherit (libsForQt5) wrapQtAppsHook; + python3 = python311; }; mkServer = args: callPackage (import ./server.nix (args)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 895df8abfbc72..dfa92a444e0fc 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -33,7 +33,8 @@ python3.pkgs.buildPythonApplication rec { psutil sentry-sdk setuptools - sip4 (pyqt5.override { withWebSockets = true; }) + sip + (pyqt5.override { withWebSockets = true; }) truststore qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index d8c30a9e6ab40..9f835c8535e21 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -23,7 +23,7 @@ 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 ]; 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/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..63a13a26923c9 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 = [ @@ -125,7 +125,8 @@ 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" ]; 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..49a13cdb2623f 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 @@ -68,7 +66,7 @@ stdenv.mkDerivation rec { substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ openssl python3.pkgs.pybind11 ]; propagatedBuildInputs = [ caf' ]; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 6beba3f4c6b9b..e1ac462330c2c 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,7 +56,6 @@ stdenv.mkDerivation rec { libpcap ncurses openssl - swig zlib python ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 5e1ad5cddbd05..be04282fcb8f7 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.13.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-nzSgJrlTRN4LDcdjvCIBwjBJTRRoch376R4PIbvcajQ="; + hash = "sha256-ENd3ozRi47vszgHZIX63nQu7wZz6Zf4HdmCsNvkcLOo="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ]; + 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..a0db526077e03 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_30 +, makeWrapper +, copyDesktopItems +, makeDesktopItem }: - stdenv.mkDerivation rec { pname = "armcord"; version = "3.2.7"; - 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}"); + src = fetchFromGitHub { + owner = "ArmCord"; + repo = "ArmCord"; + rev = "v${version}"; + hash = "sha256-+o/w3bYW3IR3APo7HppSMOTl+cU+01J+p1L0YrYgsUU="; + }; + + nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; - nativeBuildInputs = [ autoPatchelfHook dpkg makeShellWrapper wrapGAppsHook3 ]; + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-UJ3E/2+MspgVbRT7s6K4lGDvTQbWD3bwyICbJjctwDI="; + }; - 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_30}/libexec/electron" \ + -c.electronVersion="${electron_30.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_30}" "$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 4b04be48d11e9..b9ce525a9cbbb 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,10 +10,10 @@ }: let pname = "beeper"; - version = "3.106.2"; + 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; 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/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 43b5e7600bce2..ca8a163fd5660 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 ]; 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 index 23ad9cc02961b..a7742b91e0c75 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -21,19 +21,18 @@ 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"; + version = "4.0.3"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; rev = "v${version}"; - hash = "sha256-uHGqvulH7/9JpUjkpcbCh1pPvX4/ndVIKcBXzWmDo+s="; + hash = "sha256-05T/2e5+st+vGQuO8lRw6KWz3+Qiqd14dCPvayyz5mo="; }; sourceRoot = "${src.name}/src-tauri"; - # modififying $cargoDepsCopy requires the lock to be vendored - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-bM+V37PJAob/DA2jy2g69zUY99ZyZBzgO6djadbdiJw="; postPatch = let cinny' = @@ -94,12 +93,12 @@ rustPlatform.buildRustPackage rec { }) ]; - meta = with lib; { + meta = { 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; + maintainers = with lib.maintainers; [ qyriad ]; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.linux ++ lib.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 6b3f5904e9757..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 ]; - 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 index 43a18d775f9ee..e02d1972ee135 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -7,7 +7,6 @@ , fetchFromGitHub , jq , deltachat-rpc-server -, libdeltachat , makeDesktopItem , makeWrapper , noto-fonts-color-emoji @@ -24,12 +23,12 @@ let esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.19.8"; + version = "0.19.12"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; + hash = "sha256-NQ06esCSU6YPvQ4cMsi3DEFGIQGl8Ff6fhdTxUAyGvo="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -37,23 +36,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.46.1"; + version = "1.46.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E="; + hash = "sha256-5XGtyfc7Kak7qSQOQAH5gFtSaHeWclRhtsYSGPIQo6w="; }; - 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) - ''; + npmDepsHash = "sha256-4UPDNz0aw4VH3bMT+s/7DE6+ZPNP5w1iGCRpZZMXzPc="; nativeBuildInputs = [ jq @@ -66,7 +58,6 @@ buildNpmPackage rec { buildInputs = [ deltachat-rpc-server - libdeltachat ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -79,6 +70,16 @@ buildNpmPackage rec { }; preBuild = '' + test \ + $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \ + = ${deltachat-rpc-server.version} \ + || (echo "error: deltachat-rpc-server version does not match jsonrpc-client" && exit 1) + + test \ + $(jq -r '.packages."node_modules/electron".version' package-lock.json | grep -E -o "^[0-9]+") \ + = ${lib.versions.major electron.version} \ + || (echo 'error: electron version doesn not match package-lock.json' && exit 1) + rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-* ''; 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 6b4af03b5e6b3..270b26d336f0e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.isLinux then { - stable = "0.0.58"; - ptb = "0.0.92"; - canary = "0.0.438"; - development = "0.0.21"; + stable = "0.0.62"; + ptb = "0.0.98"; + canary = "0.0.465"; + development = "0.0.24"; } else { - stable = "0.0.309"; - ptb = "0.0.121"; - canary = "0.0.547"; - development = "0.0.43"; + stable = "0.0.313"; + ptb = "0.0.127"; + canary = "0.0.574"; + development = "0.0.45"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-YkyniFgkD4GMxUya+/Ke5fxosZKHKyc4+cAx3HI4w8c="; + hash = "sha256-gtoTcTcZYJdclEqi1BcxlhVJqU2POdk7XpDq7Dt5YMg="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-1HbTRWl1w9cu7D4NNFGVbHk1hvRmMywH+q2qA4+nokc="; + hash = "sha256-aJx5ruZRCnBTf/Qon1uFfxMX2a25Xg2AzbnN/UtDe8w="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-z2SsI1vmaW1HjBDkJEH468xPuyAqigOIbRDtaL4Lgxc="; + hash = "sha256-h4ULLPRhtGy6FZHKfj3AF0hjPhidVvJEbHOVgCh+6JQ="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-LgRrQ2z0/mx9Xvkb7hOrhmOqaETiBITgJDO9vce/wtk="; + hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-9Tfn+dxvhgNjSdfj8Irb/5VU3kn39DX6hdKkppJ6HeU="; + hash = "sha256-eQLPtwSX24+DOxvQcS2tFOMI6HNYedycl/U5GnzR6w0="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-3Lk+kPZcBqznIELVMdA6dRpCOaOuRrchmfHv/EAyyOQ="; + hash = "sha256-Z2b4I8WzBaubb5oGEGpqC6VlVvObyQwKOH+mxCPMuMw="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-ec2XF3023bQn/85i1xO8tTuYuprtsaL9exqRiZam36A="; + hash = "sha256-ZKjZf716RPOcXkZEFzvb4ojafafccVpjlLoEZv/GGec="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-PZS7LHJExi+fb7G4CnIFk4KQx9/cL4ALXwzOcLx4sWU="; + hash = "sha256-KvomKLcDnHyRSGwKDxwb5AZbJqMwKpvP4BC0Sn7IVsk="; }; }; aarch64-darwin = x86_64-darwin; 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-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 66243fe724444..ab264860bfe95 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 @@ -23,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { src = fetchFromGitHub { owner = "vector-im"; - repo = finalAttrs.pname; + repo = "element-web"; rev = "v${finalAttrs.version}"; hash = webSrcHash; }; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 4dfc4b97494af..adc3d09b983b9 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.73"; "hashes" = { - "desktopSrcHash" = "sha256-sSEWnvWZ6sfrHL3mqbq3T90At131C1W7N72Hb/BHKCk="; - "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1"; - "webSrcHash" = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY="; - "webYarnHash" = "1rzq05dnkwjglira52wllsl5nqw1g8whvamjfxzgvp0nyby46nha"; + "desktopSrcHash" = "sha256-o6uXn+ArwSneDMtS4AfVmSqQfAl0Gygvoj2suKI+VqU="; + "desktopYarnHash" = "10a409klzzvm6dm27803c2cgwpx1aj035ad1mdnsqyhnd4nsigpw"; + "webSrcHash" = "sha256-/PS/hEuSKXKRwS2zmH7Q8IIE20kPnOKU3PHXGSLhZZE="; + "webYarnHash" = "1j43rbn3sc6bnnf81p8y0b1jcck57d6yh07zpxlkgni1qkly809d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index d43320558b2a8..776e4db734c97 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 @@ -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/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/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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ef57fe10ac815..8436a518d6d83 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ 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"; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 26b0e9c0225db..64b971b2353bf 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; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 7a3ad36e47b74..05841080b1dd8 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "vector-im"; - repo = finalAttrs.pname; + repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; }; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index c16f8d4c2aa59..d893bc8bca663 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,88 +1,89 @@ -{ 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 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 = "20240627.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U="; + hash = "sha256-aePF1c99ju9y7JEgC+F2BPfpSAZlLd5OI5Jm6i9VlQQ="; 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,25 +107,24 @@ stdenv.mkDerivation rec { "--disable-resample" "--disable-libwebrtc" "--with-gnutls=yes" - ] - ++ lib.optionals stdenv.isLinux [ - "--enable-epoll" - ]; + ] ++ lib.optionals stdenv.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"; @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { asio fmt gnutls - http-parser + llhttp jsoncpp libupnp msgpack-cxx @@ -194,7 +194,7 @@ stdenv.mkDerivation rec { ffmpeg_6 gmp gnutls - http-parser + llhttp jack jsoncpp libarchive @@ -265,13 +265,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 +278,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/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/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/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index b6fbbd68401f1..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; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f12a51d751913..f5118bb968634 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { installShellFiles ] ++ (with python3Packages; [ setuptools - pythonRelaxDepsHook ]); pythonRelaxDeps = [ 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-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/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 0167146e57853..0000000000000 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ alsa-lib -, libuuid -, 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 libuuid]}" \ - --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 bot-wxt1221 ]; - }; -} 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 4c5fadb9ef193..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-17 -{ - version = "3.2.9"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_arm64_01.deb"; - arm64_hash = "sha256-qC3eUc3Hs1nolZJhAds0Qx+tAlD/AR3scGxmcA8dtEw="; - amd64_hash = "sha256-ofoelAzbuCgxSHsZciWSVkDFDv+zsW+AzZqjeNlaja0="; -} diff --git a/pkgs/applications/networking/instant-messengers/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/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 6db3418789b2c..72d60f5700c9a 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 = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo="; + hash = "sha256-GWU2qGeQB8bou0+Ja6Cs4bQM1stAL+dlKC3QNTA0EIY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index a272967119061..11336d70eff7a 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.12.5"; 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-5lE2jab9AK40j2rKYE8zFJr3a+drwCKnVmIZoihhJv8="; }; + 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 { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 808fc19418220..0706ce657383e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.4"; + version = "0.13.5"; # 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-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo="; + hash = "sha256-MWQz/+eusZpXUlpPemLf8Y2nOsh2lv0+Ilf/w+7na+k="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; 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 d6a543b77adbc..ffb73d9e9150a 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.15.0-beta.1"; + version = "7.19.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-RnaYRd7hKTazh0dEX3wv0fFsdbYv0aqNJtswv8/f+YU="; + hash = "sha256-kD08xke+HYhwAZG7jmU1ILo013556vNcvAFc/+9BTjg="; } 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 fcd1e22cf40c1..58250efb2b12c 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.14.0"; + version = "7.18.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-nRvGpAKRIPgXStrVu4qSMoW01SACV/wW/c05lLncCW8="; + hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 39f05b615e36e..bac57e416685d 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240702-2"; + version = "20240805-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-nPNhN4ODCZMii5VATcvh8qvdrQQ0r94X6vlaYgtQFac="; + hash = "sha256-n1mFIyrZ8d9h2m6rUzIVSt9Xdw1VlBLlXY15JLoIaVA="; }; postPatch = '' 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 ea3f0b672939d..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-keyring -, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg -, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: - -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-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..3a26639e2ed91 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.90"; + x86_64-darwin-sha256 = "0wdvsw0m1jks1n97anzamssicl9jfx9js480q3kl9hd80viz97lq"; - x86_64-linux-version = "4.38.125"; - x86_64-linux-sha256 = "sha256-BJeFXZ8STbMCmGvYRoFsfsyIpGukQkuwv0m2NzE+89c="; + x86_64-linux-version = "4.39.90"; + x86_64-linux-sha256 = "00ygbka304xnh99s17hh51lxjdkv2flh6nmn143dkj7qqabgrll8"; - aarch64-darwin-version = "4.38.121"; - aarch64-darwin-sha256 = "161z947p7a2d7584hybl77chab8y027cqpph2hd2s4b5k6bchkj5"; + aarch64-darwin-version = "4.39.90"; + aarch64-darwin-sha256 = "0rm0khbf2bqxs2ddlmss7m3sb5yy05lb96kv0a065ifadzcf5zsb"; 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; 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/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/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index aaabf518b959d..4f382dc28e75a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -30,7 +30,6 @@ , glibmm_2_68 , jemalloc , rnnoise -, abseil-cpp , microsoft-gsl , boost , fmt @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; - sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; + hash = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; fetchSubmodules = true; }; 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 b81582a65fd54..0eb675ce69f2e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -59,18 +59,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.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; + hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo="; }; patches = [ @@ -200,19 +199,19 @@ stdenv.mkDerivation rec { installPhase = lib.optionalString stdenv.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 '' # 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} + wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; passthru = { @@ -231,6 +230,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - inherit mainProgram; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 9a8e547b70eb4..4054219850b42 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -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..92daa59ae415f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -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..e90b8b6971300 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; }; 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/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/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index d1df9c108143e..eb4a9de8425dd 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.127.10-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-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew="; }; - # 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/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 8dda89f776b49..9b595f9ba191e 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; { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 74f70b71c4988..e9cb879169e12 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.0.35886"; - versions.x86_64-darwin = "6.1.0.35886"; - versions.x86_64-linux = "6.1.0.198"; + versions.aarch64-darwin = "6.1.1.36333"; + versions.x86_64-darwin = "6.1.1.36333"; + versions.x86_64-linux = "6.1.1.443"; 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="; + hash = "sha256-CBBJAa7hnz0I2ctEn7DMdzeXEs4x+aEmEr+L42ddqXE="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nKJPZQbyVG+P974hP4+4eAtupEQOf5Kl64Zp+jV/Ka0="; + hash = "sha256-CHtyL/BdyBVCQOGWjP0H/5GJiq67hPNQxELlvzzUuts="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R4f0dnwqkODFeo8mPBecAI/AGQLwYkcNtJq6UVXCPfI="; + hash = "sha256-2FOAZ3MKusouuWvhxFEcqX+2e+PCF4N5zaz7mc9Mnq4="; }; }; 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/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 404eca810ef24..2331eaa4596d3 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -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..1ff1f0413d2bd 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.4"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-TdMgt1ZgoEaweH8Cbb+wG/H1Bx9DpgHgzGO5dZfxvK8="; + hash = "sha256-X8DTwudgQyQQIpXCG7d+tdXMV33HG6ETzHsvIp3KFDo="; }; 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/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 1078f515c69ac..729afb831d579 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -7,7 +7,7 @@ , fixup-yarn-lock , python3 , npmHooks -, darwin +, cctools , sqlite , srcOnly , buildPackages @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a71595bad9523..e51fdb97aaa6b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.4"; + version = "4.3.5"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-ytRYAi9GmRILfXLgYrNGxNDng1nMl4X6LhaG/XS6f2c="; + hash = "sha256-5tvEyDLaXFuF5Jb+/BUjf7viqPe6L76B7gcdwMZrS+M="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 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..e51e6f061b07a 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,7 +40,7 @@ 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; diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 9187e935ad7c1..c976b7f82628e 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-mTa+vdYSBcXTYlcDGJWktGVRC6NPBGcjb+syr/A1QIQ="; + hash = "sha256-g/x5lVVrm1NrJbqmhza/wryEwuXHh1tDBf+x6vL+2n0="; }; - cargoHash = "sha256-xTPx4P9SbOyC3YjZNxNFh65pSfiPjMKV+wgZtT00Me0="; + cargoHash = "sha256-Sp2yMF/M3SuNB1DDQ79Lau5IxtSM1NPLJi9TnHWqnuc="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ 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..d66e8586a6e35 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -23,20 +23,20 @@ }: let - version = "0.16.2"; + version = "0.17.2"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-rnuh0+i6W9ipSM61MXd9dTlIkdGUHMjtvElW/4S2YCg="; + hash = "sha256-jACcTRIdzYiSLy7zw5QuDu9tZfee9ufhlEecbTbSr+4="; }; goDeps = (buildGoModule { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-GD+G+7b8GBwR3OrRPJbGJVom+kLC67VvlGFIA0S7UF8="; + vendorHash = "sha256-V4Bn5/VaoFOZlNGBedA4Ly8Kocw0BWyfIHv8IU6Eay4="; }).goModules; in stdenv.mkDerivation { 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/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..9fb1732c788b7 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,15 +1,14 @@ { lib -, python3 +, python311 , fetchFromGitHub , file , gnupg , gawk -, notmuch , procps , withManpage ? false }: -with python3.pkgs; buildPythonApplication rec { +with python311.pkgs; buildPythonApplication rec { pname = "alot"; version = "0.10"; 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/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index bf40dba20861a..d7c971c66a5d3 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.2"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; + sha256 = "sha256-bGqTPP+djpr+RFS6X7jUlSbxl7UDUaZLWQ3D/R76zEI="; }; 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 f605aa3617b2c..fd8d214d5ea66 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -45,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 = [ 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/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8a26dbb315c74..d3c2fda9588ff 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "neomutt"; homepage = "https://www.neomutt.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; + maintainers = with lib.maintainers; [ erikryb raitobezarius ]; platforms = lib.platforms.unix; }; }) 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..0eec9fb0c1cb9 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -1,6 +1,5 @@ { notmuch , lib -, stdenv , fetchFromGitHub , rustPlatform , installShellFiles diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3bed100179b17..608e6bf1d7e9e 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 = "115.13.0"; 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/115.13.0/linux-x86_64/af/thunderbird-115.13.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9023faca327f2ef67090cd06635030acde12caf4b028f293d06463cc6303f2c7"; + sha256 = "73600c9de1e75f0a2baf7e13d9ecded491e93f7fb4d5aa63e8e4ec2f5c95ab2d"; } - { 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/115.13.0/linux-x86_64/ar/thunderbird-115.13.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3d312b1a651a836e725ef79236ff4b0a8e73d7ebe3ee065da7d87ff329ec3596"; + sha256 = "8eee06c6f5d347d23fa2401862bc733065162415e15a8decba31d7f71afaf8f5"; } - { 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/115.13.0/linux-x86_64/ast/thunderbird-115.13.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8d645ce0694a5f9e464243f85e46c96e08c69aec7d4e7ef6b7028f457cf11a8a"; + sha256 = "6ebcc36fc7306e49513ce6ba9090817acbfcc65eefacac552d4c1fbb3d2ee452"; } - { 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/115.13.0/linux-x86_64/be/thunderbird-115.13.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c5564e5235f990caccae034b77ea835f5b9a3741e2bdcbc5ed750e1b3161af4e"; + sha256 = "386cd002e1986c4ae5e3d05e3279713994b610453745b25199906427db3874ee"; } - { 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/115.13.0/linux-x86_64/bg/thunderbird-115.13.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "061d15ae7805143fd74d8b16a2c2fcbfed471297d815692c55415c92ffe8bb41"; + sha256 = "c909a752e7f09c37ce67cd7995562eaa30cdb5f604bda70a222e376eacdab8b2"; } - { 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/115.13.0/linux-x86_64/br/thunderbird-115.13.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "33e802d7485b46bab1626dc1290db69df39c19434af8ad8dbdaecdb05cd5b2c0"; + sha256 = "511f1af492da3cd5a6aea641a8cc67f5f779196cbd81a940f3b0390dc0c1809f"; } - { 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/115.13.0/linux-x86_64/ca/thunderbird-115.13.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6bdd0eb8fe98dca531796228ef3fbc51bca6d2a220111272464192ef9744fa78"; + sha256 = "c7f087af3ed5b3fa60b94cd5380aabf019397479591be08b60d23ca782ac144d"; } - { 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/115.13.0/linux-x86_64/cak/thunderbird-115.13.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9430aa1c2e5af6e461cfe7947c00421d32e5d91f69215981f470db14355d53c7"; + sha256 = "fe7c6fe3e99f0d4d8d6e2561e1fb2e5e8ce6def6caa119d4bb73c55605c3222d"; } - { 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/115.13.0/linux-x86_64/cs/thunderbird-115.13.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f40ccf3947b4f98306697ffb984ac93ea1777019cb778fd1dd97d5f39c8718e8"; + sha256 = "222a9a0898375e5edfe09ff67a6db89a340eab4c7b195f895dbe891b5157846c"; } - { 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/115.13.0/linux-x86_64/cy/thunderbird-115.13.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "694d0e4a7ca2585afb3c8fa8a41e318c5de7fbcbe91627c3acf692974c75685f"; + sha256 = "19e3060fb67039a6fd70bbbce712aeab7def908528a3d54cc77387cac8c58d83"; } - { 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/115.13.0/linux-x86_64/da/thunderbird-115.13.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8b8f5c9895b40ee6dc5d2ef0877325ec0af21ab638abb47c5d952334fcde29aa"; + sha256 = "a2462934c90fb2433692b8ccf342c1669770a20be0c3703ecc54f65e5aaa2487"; } - { 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/115.13.0/linux-x86_64/de/thunderbird-115.13.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f6f498a1e0756248fa06b4b94b52be11026a28cadd1aaab81b49aca3a311f3c1"; + sha256 = "d45733c83c65abc1a3df8f6fc0cb2880c55405a4b2a798a5062304dc93f4ac43"; } - { 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/115.13.0/linux-x86_64/dsb/thunderbird-115.13.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2415f1a021c2005c8646bfa8b75df2115fd6d86c5eabf6bbc23aa499d3a1d045"; + sha256 = "e91883128422d834b7713f1ffc0d8095882e4f4e594940c5adf825f38ca8c1e7"; } - { 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/115.13.0/linux-x86_64/el/thunderbird-115.13.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "57b4f990a15d0a2a9361bf9ec241fbe7b1fa33f7d3da871bec68e32d1b89ee3c"; + sha256 = "f54b76e5ae958ad3eb5bf651f892fbfef460732dee8364df70ed5f8b24a77a5c"; } - { 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/115.13.0/linux-x86_64/en-CA/thunderbird-115.13.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3ad955c9557f0a692d7ce8b42cd764e3f9cb9dcba2b5bbb396a9debb40b8c1a4"; + sha256 = "fff09666b871aff621cc513aa8fab7843cb1d019e1914c9b654e8af797edfc04"; } - { 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/115.13.0/linux-x86_64/en-GB/thunderbird-115.13.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c52eff0e765472a4e6f9db49210e1aad20fcfa422749d7962c7fbc7d92ef86a9"; + sha256 = "2762b9c0c2da7b1d35b51231f395b34d6e7ed8a8c34c56a3c36fd1af40152d57"; } - { 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/115.13.0/linux-x86_64/en-US/thunderbird-115.13.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "66afb5c126670e37b7a127d33c8d93da0eabbf360ee2ece42270535069f2186d"; + sha256 = "b70d487213fca89aaed8c2a1da07e179597cf70c6bc56e5fcc93855afdf66365"; } - { 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/115.13.0/linux-x86_64/es-AR/thunderbird-115.13.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ab2ba1379c80e1e52971656dcea195d06c0c19d4ccef107a55e92dc8dfc24d0a"; + sha256 = "37341713a27b90cd8324585cbe2b4413ed0ce3415366b27f1cbfb97f91595e22"; } - { 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/115.13.0/linux-x86_64/es-ES/thunderbird-115.13.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d55e1ac9aca0f85a890e6a014407eeafcd75710157a6c869d03c5d9bb3f010e"; + sha256 = "c2412ebe923dfcdc464bd6d7576c0fdfde748d26b5684b75618b21fa3396d69a"; } - { 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/115.13.0/linux-x86_64/es-MX/thunderbird-115.13.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6ab228494d21fe9846aa9370942ef619422b3a65106ad943e5870322f011d2d8"; + sha256 = "6a1e03cdf4605b768feb802502dc00b9cf7567804c8c2cc7eebf7855c10e555c"; } - { 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/115.13.0/linux-x86_64/et/thunderbird-115.13.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "46b9ed9a8a4244b0660b04acc357b27dbd516bef5b0c82001021a46f72087305"; + sha256 = "e8d92ff29455577680ea1c24f5025387ec502ae5ce65a528c3d526dc2b0e23d5"; } - { 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/115.13.0/linux-x86_64/eu/thunderbird-115.13.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "322ef300f4a92bc5263e3fc5aef5a6ce5ff13bcda841af06546c2d580e104b89"; + sha256 = "0added0bc1846f7231a8806bbf5d4478743fb9dab3ba12270a540cb298ce2e12"; } - { 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/115.13.0/linux-x86_64/fi/thunderbird-115.13.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f84c400cf83c8676b25669fe9208da4da56e3a88161fea806b39fb61b39ad79d"; + sha256 = "08ecb359ec9f1bb79271fae375f4094f32232ca17ba516b4dc68d33a49fe26a4"; } - { 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/115.13.0/linux-x86_64/fr/thunderbird-115.13.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ed2aeb8f849e433771f79bedc8b05ab83cc7a22a0b7c7b4fc333ded3ec0a18d1"; + sha256 = "5cbb360a2f824a63a06996d8d7bd11184f04a154acca6d11f9d9ad149add7211"; } - { 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/115.13.0/linux-x86_64/fy-NL/thunderbird-115.13.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "99210d27c75e591355fb641664f8e477b412b79ed545b87f9fc10b7ea7956c5c"; + sha256 = "8c489d2e33c2c0d0d1ecb7c8d8766fce2498ee1256cd37e12f4c975b5533a98d"; } - { 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/115.13.0/linux-x86_64/ga-IE/thunderbird-115.13.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7cb91bef278037efd512f8e5384cb8011ffee3025c0209c9d575d0693523891e"; + sha256 = "5841ef91f177e47ff8a272e76cb57968863c341531b45a42c14bac80979b3187"; } - { 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/115.13.0/linux-x86_64/gd/thunderbird-115.13.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "116149801edfb6166d651eed7752cae466a7998700e2d85e0fa0e89dcb8ed12b"; + sha256 = "a07eacd6df3834980886517a9eb1f5d4a6c05d087bb6aac024456b1867079ab6"; } - { 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/115.13.0/linux-x86_64/gl/thunderbird-115.13.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "47789526c5de43000f58bcdbb0a88e7fdd67deb5f4fd836236347cf62194b9ea"; + sha256 = "d5359822c6817dc8937a3d24e3e50efa27d450c1f9d48d5b79c63b7ffce54439"; } - { 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/115.13.0/linux-x86_64/he/thunderbird-115.13.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9f3968f4919398b33bd16c645d86aac5e58d8b713204ea5ac8db06f37f3c8fbe"; + sha256 = "5320ef08555bf368c4e09a80524429482f2b23fb27b8b2850ef4a1f60eaf34b0"; } - { 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/115.13.0/linux-x86_64/hr/thunderbird-115.13.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b5e436bf3c02a0a9085b0a35fac71646dec1f0e83970e7532fcf35dcda8cd1b7"; + sha256 = "dd6a69a320ed40b662814da28af7165ac499cbcdca1371bba86ef4c84f0d0949"; } - { 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/115.13.0/linux-x86_64/hsb/thunderbird-115.13.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6e42557492e0db90f0a42c2c239f8bf052b9c4c43a55d615fa1ec4da5a5c678b"; + sha256 = "fdc547651aa09c3874366180d4e3fcca407fc8efba5745344cfca1f5c4597003"; } - { 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/115.13.0/linux-x86_64/hu/thunderbird-115.13.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e11733b4f2fd13071fb0d1e25f3f21c0c022016e634f630a98cd5053d0850889"; + sha256 = "85b1b6f9b3f52258ddae7fd03dcd12dc87564d5d797cf7dd8c9fa6f1278da233"; } - { 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/115.13.0/linux-x86_64/hy-AM/thunderbird-115.13.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0a13c41658426d99de46f3b7e6a5d2faba81040ac71368d910d1222b9d47b8ff"; + sha256 = "13c0f0e3b112ac7d4ec0c794458b81057f9965ca718b10bf2b7880be4f4a85fd"; } - { 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/115.13.0/linux-x86_64/id/thunderbird-115.13.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d9194d612852c4e7cf7ee466e95318716c83a2f7badcba280a31eef10d8296d9"; + sha256 = "700393b3b121a6398e3f809d035e5b90fd8f3879f0a751a4ed362fb973b3ccfd"; } - { 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/115.13.0/linux-x86_64/is/thunderbird-115.13.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "143d425cce754af88da296fd1dd3e40b0a2e125f6d45ca066940efdeeaa92d11"; + sha256 = "8eb368b9ffc00aa06238af03c16c3b183858aff829d5741100e515498bee065a"; } - { 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/115.13.0/linux-x86_64/it/thunderbird-115.13.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "130e92f13ad92e110378eee9f2caead36a4280d6380d45390ab6e6d4b7e2bf86"; + sha256 = "c3d8d2136e3a0096c07413c0c591cc60e322ee1b929b5f6cd99708413014913c"; } - { 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/115.13.0/linux-x86_64/ja/thunderbird-115.13.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9561fc79e72fe60c36313f0e07b14f04cae28a47108832cb3853d5da610c6652"; + sha256 = "af6109dade0343a3354e5b8c82df8505ecca189bb9eae0037a578db4fcf99f1b"; } - { 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/115.13.0/linux-x86_64/ka/thunderbird-115.13.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f37f5eb50af136c712726c3ed180e564a243ac9b0d87166ec0acf058f6be7bf7"; + sha256 = "ad7c22e31b575f28268794b390d75021bcf67cb2a4d7ecbdfc3a5bce8f547160"; } - { 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/115.13.0/linux-x86_64/kab/thunderbird-115.13.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2923b3671f38b72890e0d8be963ecccfb682ce0e09ff2286d05fc0d86413da45"; + sha256 = "0356017444c3a046c85599f7188d012f1a8260a5a76d42e8bddb3e937ff1d0db"; } - { 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/115.13.0/linux-x86_64/kk/thunderbird-115.13.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c3414484527fb499b4fa1a19010e97b452d1c6a48d0731ec3f8bb7041bc2d400"; + sha256 = "d278f53f92f4514b1a1b0cc87a6329e1cfe53d82c815557d2d1038b192fb0a03"; } - { 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/115.13.0/linux-x86_64/ko/thunderbird-115.13.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4caf7796c7af7e9421d1f20f8b238abd6ef369131e1beb614fcba6d8e15c397a"; + sha256 = "0cda6697ab6041f0983447e5594158e185905d34a7b3ec70022f258403dba6d5"; } - { 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/115.13.0/linux-x86_64/lt/thunderbird-115.13.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8c9c7de04c3537013e002dd2833ba9bd0a647e4e01f2d94e9eebef88a67dcae6"; + sha256 = "f783e465629993c2e5d7c5f71fa421b289ca1051ab461ea4e128a9facf370e21"; } - { 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/115.13.0/linux-x86_64/lv/thunderbird-115.13.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "63fa8509fbb99621226378d79ad75b0cf7f474dd7403bb8963361c81c9d01c61"; + sha256 = "b64684c99509c9b2751d4afaced2a2f6067251345f672eb84d2337f9082fee67"; } - { 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/115.13.0/linux-x86_64/ms/thunderbird-115.13.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9de01e0ede9d4d6196c7b72e08f7abb438681a303b679abbc1f8294448211ab3"; + sha256 = "a001272f61877db602f26aa80c485f0ad7be82acc26343fbf18a95040aeed429"; } - { 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/115.13.0/linux-x86_64/nb-NO/thunderbird-115.13.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8eb261abc0f68e42bd048315957acc47665b275bce848372e1b0953e2ab99c26"; + sha256 = "6d9b817608399d59a20d34da172529eacb950e19ddb3cb3966f8acb2704099e1"; } - { 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/115.13.0/linux-x86_64/nl/thunderbird-115.13.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c4aae2a0489d919c4665285b402d113a8efec53d15279eff056d9a576888287b"; + sha256 = "259e8b433b7c757c507f8deb5ae9453f593f353a7544ec6d8e4b798b3c9958e1"; } - { 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/115.13.0/linux-x86_64/nn-NO/thunderbird-115.13.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4495660e73f937a07c2745c6d48fa43a8a159b1d84d8e6859e1a42579f1157e5"; + sha256 = "0af2bea6b0b4b56dfbbf0b3a4845d5540d17a2998ee000c16a9dee0e63814ee7"; } - { 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/115.13.0/linux-x86_64/pa-IN/thunderbird-115.13.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "874ae66c39b199981cc02363bed7a2a74c133a80b591785c8c862e7499b17c89"; + sha256 = "7a686986ed8d899ffd00dd770c04c16a0ba5ef66e6889dbf34e86d9794d27448"; } - { 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/115.13.0/linux-x86_64/pl/thunderbird-115.13.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ae7c458b41e7eecc2581be2801571bac54933372797d291f03acee7311ba784e"; + sha256 = "d736d10c5c57a2b8b5c7ddd8620eea673e83a4efb66288dcac4f39fb9cafdeef"; } - { 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/115.13.0/linux-x86_64/pt-BR/thunderbird-115.13.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "30912ac7a19d1bbdad39e537f78d512951124a44407eddfc4382c1175cae76de"; + sha256 = "2666dfb8ed5cdcc747d91b5a8f396a268243c9e46aada60b26a62ac1904f11d0"; } - { 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/115.13.0/linux-x86_64/pt-PT/thunderbird-115.13.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2cb2225df1364a1f67911a0cbbe034d62df6fd51b567e5fa8b036273790c3fad"; + sha256 = "ba1a76293cac33601f8317e538b54c4a05b277f862d3e76e11944a0d51d0b4c2"; } - { 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/115.13.0/linux-x86_64/rm/thunderbird-115.13.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "09d6d3cdf00a280eb2b1149154150b1ce23e2761d379b1b4eb362422e0ce7584"; + sha256 = "d55625a4a75b671cc614f04fa55337df80d0949906256c8852274b0c73f9d8c1"; } - { 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/115.13.0/linux-x86_64/ro/thunderbird-115.13.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fdffa6a81e15bc84f4cb1d48ebc1109413ec10f40ba7ab4a78e8c980fd447683"; + sha256 = "ff56d88c4c003bf8e5aa245b65ae17d0d2a3f40ab5cf341fedf7b2bbcfec7088"; } - { 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/115.13.0/linux-x86_64/ru/thunderbird-115.13.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cea8488bf4537d205b3fab1f98239f7cff85fff6c2f7eab247a3191e089c14e"; + sha256 = "a9eb569ff312c13fc651c44f192c64cd46eb27624f71a4ad9399b0531cdf1a57"; } - { 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/115.13.0/linux-x86_64/sk/thunderbird-115.13.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "eff9c4d36259590e8397cff0ee8ba407e5f116b541f730e5845a2bce70f7a68b"; + sha256 = "82bb11f5491a90404d40692218848a36c62ee1f73294f94abaf89102c185dfae"; } - { 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/115.13.0/linux-x86_64/sl/thunderbird-115.13.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "97db4b1c97a85cc65c16e72e166a1739bbfa20e07be767e5695c10fbdcb86231"; + sha256 = "b5400b07f12e0712157bbaedafd9f88e7d2326e1407b9a989ae9da8fc245c558"; } - { 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/115.13.0/linux-x86_64/sq/thunderbird-115.13.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f6d3b3a90cc9ec5c794b803675c141c9cc6acbdc6d25093369ecd0c937206f85"; + sha256 = "cff26cd2e27db6c374d1b34da18bd513010bd4572a5abd3179cb6b0bb062a750"; } - { 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/115.13.0/linux-x86_64/sr/thunderbird-115.13.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3f6f0f5222f4481406087b11bca95b122705e60d3050040e31f901960d729aaf"; + sha256 = "bce534608ef8da85ea0083dfc86c40759b4b073c90369f94ed98df3d41c3e1c9"; } - { 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/115.13.0/linux-x86_64/sv-SE/thunderbird-115.13.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a168edd15476aa8150718de09fdb0d94bee32b9f20dc9cfb4ef942684a96e857"; + sha256 = "3a2e9f610436b140e3a7098ac27516c3ce5fe2dd672e23a85050bbd896bb2738"; } - { 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/115.13.0/linux-x86_64/th/thunderbird-115.13.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "65992ba363ce0378a271cc0d073e64176873be8dfd5a4c6f3378b5e819aeed0a"; + sha256 = "3753527489a666c2e89cc1c4be85d85a52890069700ef9bd809e14a50d253d37"; } - { 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/115.13.0/linux-x86_64/tr/thunderbird-115.13.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d1a2c48e4c12977151361ab1264d26b0027fc74a256b7a2ccdd3e38050a14049"; + sha256 = "90d37e9512c46db20d8ce44863dabb1c72b196fb26e462e310f83bf7472763b1"; } - { 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/115.13.0/linux-x86_64/uk/thunderbird-115.13.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ac72a9b613ea56178c2f5a16ec59a5f4d481b85aed1932689ea1cae328d8e81b"; + sha256 = "07f8d8809d3dc079e9f5d25f0b553b96efa975c69f4b94ddc5772bbb07c6f2a9"; } - { 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/115.13.0/linux-x86_64/uz/thunderbird-115.13.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0db8b885543185f06d0f5ae4ee18b95046cf00172774ccbd6c79f825e94a0a67"; + sha256 = "7d3d207fe4f427b5492771a6db5f6716d0f49ea2452f3521c53d06da15090135"; } - { 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/115.13.0/linux-x86_64/vi/thunderbird-115.13.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ce91ae20b5feaa7f0d9a20de5661bfece4b84da32063bcd647309ad0c7a3a342"; + sha256 = "48de00ce91f678f9e2b2fdddd57b164feee7c06079c10796707cd1be67452cf1"; } - { 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/115.13.0/linux-x86_64/zh-CN/thunderbird-115.13.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ab89a35b926209221fb672bcd9c3a83c636e3c7b95b507926ca6317e5f977b51"; + sha256 = "686dd1d40c6e5d473b7f768919567d71d7a32bf277aa4f20ee160850d4a19812"; } - { 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/115.13.0/linux-x86_64/zh-TW/thunderbird-115.13.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "407062f4b5de3e40e44888713a39337b6e223487a76fff0bdb7219154700cfdf"; + sha256 = "3be64c8cb88ab2e93ce85249110e91da26f958f5f667f9b2c3524d9337aa3ae6"; } - { 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/115.13.0/linux-i686/af/thunderbird-115.13.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "19b5940f6fba18e0246d1173d2a5fcb8c93d7265ffe8c9028647f9ff0afbc486"; + sha256 = "fc6f36e813419ef33d9491c0317c8f73a7d08a10d2767446a6e708499d0664db"; } - { 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/115.13.0/linux-i686/ar/thunderbird-115.13.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9dc9deb45751da0d2d09d0331eaaa89c318f2457d575a2c03bef207f169e8de7"; + sha256 = "d7134af862d2f588623a9414d0e09702b04c20577f674ade2c67269db25e7bbf"; } - { 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/115.13.0/linux-i686/ast/thunderbird-115.13.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5710e364f670e388d9bf6dbc8b1fb7fcded75806a4be249b7ddacc2c24d6da06"; + sha256 = "5632d2264f4ad78115c66542bb9a30bd92044e2e480612f0755d1f2bbac1fa39"; } - { 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/115.13.0/linux-i686/be/thunderbird-115.13.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f7e20df373381cc63c4d52c50c4e9305bd9378c2e2f1d21a4d2f0db36d831156"; + sha256 = "522b1219b3586e028023a0b40b5a0b807fd5bbf26981ae0b28fed41111dfd97f"; } - { 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/115.13.0/linux-i686/bg/thunderbird-115.13.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8c7332cbbcc3df7be3b6ab2d7e929031c4e349de0aa548b775c6b7af3e63cca3"; + sha256 = "cee2dbcb5d3e6cff325cc5a9132d574c48cc356a524b619ab0efea481fed87a5"; } - { 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/115.13.0/linux-i686/br/thunderbird-115.13.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4b5621ab96b9a937851698e18347259155803a3cc7d7ac9b7227a3fa203178a7"; + sha256 = "5583cf26d49f32dfaf5a7000c8c670d3b7fd1e839595960bc73e81e5bed8b2b1"; } - { 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/115.13.0/linux-i686/ca/thunderbird-115.13.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "965a5374467b248e52f9508154fecf9d6bb9cb58eb3fd6be240d74a7208650fb"; + sha256 = "7ecbeb64308d4a8962c86a75742dcf86ac4f3a0009fa60071f1ba90e3fd89cc3"; } - { 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/115.13.0/linux-i686/cak/thunderbird-115.13.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f17a469e28cfc5aa9b2b795c1d7517e076146f87cf534b9fd4a4ecc905858a4a"; + sha256 = "4c55e8fa96c9763d1b8e9d8c47b55683827dfceac982514206c422edd34afe37"; } - { 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/115.13.0/linux-i686/cs/thunderbird-115.13.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "802fa9a0d857a973592ae87a94fc9ba3b18c8fc86a3352d90d152c0a7ece0db5"; + sha256 = "6f0e483d77b6322fcd50decd868994c9a22e8f7f8ede4a8cc6def64cebf3fd36"; } - { 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/115.13.0/linux-i686/cy/thunderbird-115.13.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c9cba2912211963ca4acccb1bbf9c904e9a79f1c3781a69df76c003bbd1f5c1a"; + sha256 = "0c727b6364d07666417f7ab03dbf9e8e1cc040d855cbe361e1385cb2d4aa4242"; } - { 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/115.13.0/linux-i686/da/thunderbird-115.13.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5c54d287396d2c172f463010bb5be1520a5c7636a6f79435430420943036a364"; + sha256 = "819b01b0fb03eab22d58de73f464e98133778154e122463d20693b4aa1090ecb"; } - { 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/115.13.0/linux-i686/de/thunderbird-115.13.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c6558305d0207a706fb8f5af595dbfc2515652a732fb7e95646a334335a01a61"; + sha256 = "84db18d8ebc383fac729a9e5be2554169368aaaac34523450151ec9c4f8015b1"; } - { 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/115.13.0/linux-i686/dsb/thunderbird-115.13.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9eb4d57f121df4714d91ac0a5075face494fb6efea301625ede1b4420c398ff8"; + sha256 = "4d23aead7db91ca8f657f6eefc3cb37d08be537586d492122b2583c5e4bac516"; } - { 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/115.13.0/linux-i686/el/thunderbird-115.13.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a96136d8392cdf21af28efe2b512efd45190e97ad420a293cba6d621ca7f2106"; + sha256 = "44833b968bf29d784163776cc7343d23a9c4a781aa36728dcea9fad23b776aa8"; } - { 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/115.13.0/linux-i686/en-CA/thunderbird-115.13.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "30d9f5125940c08c77d2c6f2aa2de794fd9abfbdf88640dd56c0ed4e87f33ead"; + sha256 = "c29f159ff4a8aa234f8117c936fc1621aac4ad12841ac261a85c7326d9ad8704"; } - { 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/115.13.0/linux-i686/en-GB/thunderbird-115.13.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9e78d591b35f8aad5811a5cdceaf9ab5d394fd3ad1dade692d21a3ccbec4b14e"; + sha256 = "51a2633ed89f3eb08df77153a1a894983b9609fab6aed998cbad7e78129845aa"; } - { 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/115.13.0/linux-i686/en-US/thunderbird-115.13.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1f459cd30a477a654f91565963ba6ef077c087a8fea98ac36186c41ed78db627"; + sha256 = "badce662962c90cc0fe4a0e89c7b69185fcf11ac1fdebcb12078226d06eec7cd"; } - { 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/115.13.0/linux-i686/es-AR/thunderbird-115.13.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "17cbdbfc9df3e0f8447f73d8205ff4e126cce613ff596c64dcc99992e6c2bddc"; + sha256 = "6e26898de69237d3915c7b7b18ee565e1b882a0a62ff89d0c64de74f4cf32b06"; } - { 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/115.13.0/linux-i686/es-ES/thunderbird-115.13.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a5622a156340409aa1ea7af7b0531741e3024a1fdacd9bc5307a17d596dfe720"; + sha256 = "8de6a6bc3c688375239fd56a72c8f9b5db45dbc01793cdb4e508b89b600957cf"; } - { 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/115.13.0/linux-i686/es-MX/thunderbird-115.13.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cb69980eafc5209b37606cdd2b6657943d2d4f827450fa0f9bbf64ae31bf8a05"; + sha256 = "d7fa892b266cde71881c6bc1a2926c273ac9990a5f555a1da7ad92e8da7d2079"; } - { 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/115.13.0/linux-i686/et/thunderbird-115.13.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b8ad3424ba8f4aa2affd9cf03133d64e0c68513983f733c4805962ca0535bd40"; + sha256 = "7e3f6026fd7eb69fcc716b1fd512e43bb24e666fd9792b9c0fcdecc6c2080c64"; } - { 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/115.13.0/linux-i686/eu/thunderbird-115.13.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "800c8f9ae9486d8109bc0e62636b511662042b6115313e4be5e50cb8851b0d8b"; + sha256 = "6992361227e6455834651d2d4c322d68b2772e81f5d41495bc891c6968a31fb3"; } - { 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/115.13.0/linux-i686/fi/thunderbird-115.13.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b4e47065f2f91cbd84c16f23f25682dd1928ab966c497d0584cc19eaaf5436a0"; + sha256 = "eb2f64b6079a7fc82ac9cb300a3263682c30f5d5ca88b7e8ffc239b0eeff2e4b"; } - { 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/115.13.0/linux-i686/fr/thunderbird-115.13.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "fd47e4c10a7c1c70c34635a899aa03c139666b3b5c9752dcfd7f5d6aaea750d5"; + sha256 = "2cd90fda0de39c0c5f880967d5b3c887b82a4b2b2cff68e563cacf918d1067c2"; } - { 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/115.13.0/linux-i686/fy-NL/thunderbird-115.13.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1d690a540600918e3bc8ee664b29cb9855b10c961d2d09bf434d3473ceb98933"; + sha256 = "79e3d745529f8ba10c47bf47c530d251a60fba60ae6434c28b21d6d920715343"; } - { 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/115.13.0/linux-i686/ga-IE/thunderbird-115.13.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b62a866a69ef782a51e5a0e3ad314e944a0cb63968454d049c5c2112adaff143"; + sha256 = "eecef1ff59423519f2dcda87e5bbe2d627324c1e2812d2ee8554fe4624ae5f13"; } - { 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/115.13.0/linux-i686/gd/thunderbird-115.13.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "35eafe0440625d32249d7cc721f2fde9dc7331f9d4b542682f23f3c3281f584d"; + sha256 = "98061b5bbba7663a76ba1fd81c45da1b819dc60d7eb328865bb4e6054893e68c"; } - { 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/115.13.0/linux-i686/gl/thunderbird-115.13.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1a6badeae7defbb158615639fd129a59e0b24db557f5106fe20b85d0b5e0b46e"; + sha256 = "20b27324d5d1007898432a5149be39e023d0574cd9412e1981644fa437559462"; } - { 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/115.13.0/linux-i686/he/thunderbird-115.13.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "12cb6baa362cc0c4147cc75d80bf94d0a5be18dc895aabcc1359df1bd483e096"; + sha256 = "d0b623cb12b09e8da788a248d9d0c73075a47ab400cd5e9636d63f802d81239f"; } - { 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/115.13.0/linux-i686/hr/thunderbird-115.13.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a130fee072cc32f1203da09507e5935aa1669b018a44f7d6ca097119f835e184"; + sha256 = "a4c6f3c8c4e39677e4fa7a7260bff44764fa66e571919d70349f615429ded199"; } - { 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/115.13.0/linux-i686/hsb/thunderbird-115.13.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5e564ff266867829b963e058a2cecc5da29258acb1a852329e7d57c746e5ad61"; + sha256 = "e059202e8add45d767878d96af50d08e540e21af6239e101825153ad3bcde087"; } - { 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/115.13.0/linux-i686/hu/thunderbird-115.13.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c050c63e38cdd80d57b1d06abad5f3810454523ce1f9c2bb4c25ed656d1f3102"; + sha256 = "a02b0c0460e6bdc54f4d9be92e78ff5c6f8730e1f7199f5f0eceefc220d585ab"; } - { 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/115.13.0/linux-i686/hy-AM/thunderbird-115.13.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "56536454c673a14a5166533f695d31168a6a64d14b69a5a344270b8e1a9b9754"; + sha256 = "53b02544de8294c1292311510f5e72b0b0c6c0209e3d01d92d603e5e52f988b6"; } - { 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/115.13.0/linux-i686/id/thunderbird-115.13.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f6731b88513533b355b73293fac108f77c2a0a4c47e2e5ac4ab560a91c90cc4c"; + sha256 = "014a9d5214ccd346df23168d1f523374bc5058d247a3817fa8a3df1af7255230"; } - { 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/115.13.0/linux-i686/is/thunderbird-115.13.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c9ba2344d981c83bf78e38f2d694db8ce34877dbd62cf4fe2657c31e4ddb8420"; + sha256 = "f81280dd398b1e5f6e003ec040052f739d20e3f5bc6ebf79ba5ddef068ab9cd7"; } - { 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/115.13.0/linux-i686/it/thunderbird-115.13.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c4e4c6956aff5ccc290a3fec4354c7cfff3bc9370917820208e270211730d3a1"; + sha256 = "54a9b84390fe010708a901aeedd95a1a6b51aeeb44c47760ee68c261898fa52a"; } - { 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/115.13.0/linux-i686/ja/thunderbird-115.13.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a998c41e9afc12fb0f79146271a88f45153ec640ccd5c62132f2081cf404f355"; + sha256 = "a3a1e497d31244a7acc5ea99a1cd4129c28fc00d82d750b5ce360165e7c6b915"; } - { 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/115.13.0/linux-i686/ka/thunderbird-115.13.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20d8145d782954c0647e416a062dff881370bbed4370d122a74f8d0854cc542f"; + sha256 = "df4ea755689a82315627d851fa7b59d5cb9730064785099273431e1993ccb529"; } - { 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/115.13.0/linux-i686/kab/thunderbird-115.13.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "065579cf33edb1ecceb56b5f3fa3a4b1f4f2da93dcf666aef859206fd30f515a"; + sha256 = "e40f72751b40fe6896ab0cdd78ab540ece04d1650c35d1d9af944f5e9983da69"; } - { 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/115.13.0/linux-i686/kk/thunderbird-115.13.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "691b931acec550b087ec3950bb74f17b040bc0b8f9f9cf475603906a9fcaf5be"; + sha256 = "aee0ac4b2bf06468b0fd4d302507693c3e5a76426d4aa2b4deb9081f054156b3"; } - { 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/115.13.0/linux-i686/ko/thunderbird-115.13.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c91281e38d08a5c738ae3cf1be458566c998c0d65e588b0a463202a6bd19020b"; + sha256 = "32cbdac8073fdc47feda1e17754a1966d668d10b881d137d593f10ef61f1c8a8"; } - { 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/115.13.0/linux-i686/lt/thunderbird-115.13.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6b9309f8f3c1191addb96770e4569fadb81de8f807790d9d00ad303d0d47a2e9"; + sha256 = "be4a3241453d43ec04586d27c7a2d09c96ab0558eba5c52a6242b5cc39f7be89"; } - { 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/115.13.0/linux-i686/lv/thunderbird-115.13.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d91fef64dde27d7b756327afa8b115e07c58906fc1bccb98ca893755e34a36bd"; + sha256 = "6b92c31b2e2cbb9f2dcf73d29004233f4a4128dfa315fcc0e642aab59ea65c82"; } - { 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/115.13.0/linux-i686/ms/thunderbird-115.13.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9f2b25e37d18a39542d60257813d72a7075dca6dee2fe70e437de430cbeb2ee2"; + sha256 = "87cc4f4a7cf59361c899990e023a57ffd6cd7f8b575fa4f06b5045d71b7d0ba8"; } - { 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/115.13.0/linux-i686/nb-NO/thunderbird-115.13.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "44fd3298de7c95033c47831484549fbd8121b463f2e904d51b43c9502e712c09"; + sha256 = "5a21efede9c8f142e77c37dd569a42467408c9863c03b791b26153c4e09a962a"; } - { 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/115.13.0/linux-i686/nl/thunderbird-115.13.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "067f544982f4174eee55d621a495e9c286f70a70d0ca072668a087e434906a2b"; + sha256 = "d6158645ee629b89a6d518d1e62f6777f3f453e6546ad177979473f432dfb376"; } - { 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/115.13.0/linux-i686/nn-NO/thunderbird-115.13.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a60ca5cce0a272b2213312fc86930134c2d513fb8d7d8eea9c77de68f2fdbf0c"; + sha256 = "1528148ba47eabfce476ca351ba0c7341a5454d38c798c3b6dfb1c2f02efd3f8"; } - { 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/115.13.0/linux-i686/pa-IN/thunderbird-115.13.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d5c43a67d0cb9146ef6d9b076ab04c37c22e26ee24e16867f2af497e752a8aab"; + sha256 = "8d6c1f3ce92af5e19e24661aa7bbbe815e3c9ac7ff3e9b6db7c2662e8f56f97c"; } - { 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/115.13.0/linux-i686/pl/thunderbird-115.13.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0c9df1326d8b72f3492f690c34841fa4558452fd2a386b2724e8433470effda7"; + sha256 = "b26ab380e57e442047092f8f12ce701fc062d3dffb3fb905ffde8ec1c2bd9975"; } - { 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/115.13.0/linux-i686/pt-BR/thunderbird-115.13.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "69fff4ee82f72116bcfabd82fc44fa9878e2d1b378120ab22958784e257b32d4"; + sha256 = "23ff7b60b2a754c34bf243851ce7896cba6918126615ebffb030180fc4df754b"; } - { 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/115.13.0/linux-i686/pt-PT/thunderbird-115.13.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ce4a6b8a0b81e7a481a08222671daf80c9ee1f0f6a41c1e10e9b060d1b64db23"; + sha256 = "f6667f60d0a54f4e5c25b7c15d843f7215fb0ff8f65962b9ed219f9fa1cac9c1"; } - { 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/115.13.0/linux-i686/rm/thunderbird-115.13.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a45d5e83cbaf53a7c7d87e3c573719b03017f6fddfff7badce77b8a29012c404"; + sha256 = "c6c6d412f9a01824bedb46094239caec8c8f32b249f5c9bcce455166472e0c8a"; } - { 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/115.13.0/linux-i686/ro/thunderbird-115.13.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8e59f5a9da26c90e2841931c3a54f0416b425b9d084a97370d3794605fe9f815"; + sha256 = "d87bb9e6262ca8639db9c72dc512ccd6e2c5c644b2540b76f1d8db2c6cc11681"; } - { 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/115.13.0/linux-i686/ru/thunderbird-115.13.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fbdd472bc1d768fb7bc5491772326ffdda0fb48c2754e6dd6352dba20d2d221b"; + sha256 = "933509f254d0a83807eb8423a812b44fa293a34302179bde31f8e7c63f29f17a"; } - { 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/115.13.0/linux-i686/sk/thunderbird-115.13.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ffb92d870c91aeb8385d3a5a1aedd86198567861e8a8e9fe249671c42b9f0e8a"; + sha256 = "7075f022ecbc76d4c00a9816f85f22a08998bd44080b3edf7bb2b15f78a5ca98"; } - { 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/115.13.0/linux-i686/sl/thunderbird-115.13.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e291960c5edbaf370afb39593e79e50d896942358fe1b19a0267c5cb68e09bbb"; + sha256 = "66bd3ea1238198fdf240fa471c846b83ae6ddcb7bb164d3e0bad8480c2b0c9cc"; } - { 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/115.13.0/linux-i686/sq/thunderbird-115.13.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "613aec7a4f08bf323f75a8517deb27fe4957e7119c45e8c91628dadf51f9ec64"; + sha256 = "0fa98fbe0ebd473ffb247546fba6e7ebcb994bbd4bbbbffb868c2d27984ed8e2"; } - { 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/115.13.0/linux-i686/sr/thunderbird-115.13.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "55b488eaf7dcc4fd0e1a8ca4720d82960a5a93a32e729f5b0b3b95e535971776"; + sha256 = "8388932ebc71148cfd3be78d5fd31754c78c4e249930ec5290876655e115207a"; } - { 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/115.13.0/linux-i686/sv-SE/thunderbird-115.13.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e3ace007963edaa894c97701bf80acf2cdbd1609e2d0d23aeee56ec53aa4fc79"; + sha256 = "793f43ad4062323b408527cbf98988291452fb5007938fc6c75f794a95f6fbbd"; } - { 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/115.13.0/linux-i686/th/thunderbird-115.13.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "17a3032090164feaa68196709e19d8a255beed609e3b178ff08009efceb39c2c"; + sha256 = "ccd43eb6dd39d0be2af3ab4581a1d49563b78aa1389ff227b5b9c7ae83a782b1"; } - { 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/115.13.0/linux-i686/tr/thunderbird-115.13.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5eea9db6abfa816f30b0bfb0e6da6a5b9777edaea1fc451cce6ed3a5a44f7df4"; + sha256 = "61cef2f34fba3606af62ed2cdeff626f73d1bf628af17c9a30b151da4f7357e2"; } - { 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/115.13.0/linux-i686/uk/thunderbird-115.13.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "300d12c8eb0f735996bcd443adba9252d5ec4267cf9348ecff8f4a9f22ad3afe"; + sha256 = "51daf721ea9864fb199eab9908792b67031005238067543f4a69ebc5ad4fb10c"; } - { 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/115.13.0/linux-i686/uz/thunderbird-115.13.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "bc6707522482d5b01e2d908040f878322e79bee9e2121c041b340cf12634058f"; + sha256 = "83acb46cce8a7e94e16bb0dd323af816284728d507c2787ae3a8e77fd78662d9"; } - { 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/115.13.0/linux-i686/vi/thunderbird-115.13.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b4cd7d36debe223a05a1539e33c951564aea27d392cd0d1f081f14b3cade6d7e"; + sha256 = "2ddc9a1b085f1a936e1ac10fb84440cb6159d77baab95ee7a2073202b3341987"; } - { 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/115.13.0/linux-i686/zh-CN/thunderbird-115.13.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "956851f3eabd6345ebeb6719dc3e80dd30b66bf42c1078e02996dc5b0ea66e67"; + sha256 = "6468070bca4ab013646945206c04a03a9b5ac5bac5b07cd48543aa0b7e980353"; } - { 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/115.13.0/linux-i686/zh-TW/thunderbird-115.13.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "93561ed61edb07a8a4882e0687db51238d31f7d6c04919b39b3e88156d3be132"; + sha256 = "27a73e84abdea7e4f9d4fe595129f08dd92dc9fdb4d2a3c275481096be90cb8a"; } ]; } 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..ec18ec2bfb3ea 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,21 +1,19 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: -rec { - thunderbird = thunderbird-115; - - thunderbird-115 = (buildMozillaMach rec { +let + 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 ]; meta = with lib; { @@ -30,17 +28,13 @@ rec { # 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: { + 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 @@ -51,6 +45,30 @@ rec { })]; }); }; + +in rec { + thunderbird = thunderbird-128; + + thunderbird-115 = common { + version = "115.13.0"; + sha512 = "98ee23f684aa7a166878459a6a217bf3bcc4ddd8fa8ebbd0a1d2d66392ec1ebff67dbad55d145cdd0771539f127d91c4137211cf4efc80e450e6a34c95e8529c"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-115"; + versionPrefix = "115"; + }; + }; + + thunderbird-128 = common { + version = "128.1.0esr"; + sha512 = "cda64afee45ae20a627116f9475cc4421262db40a7efa09eeafcb6e96f8fad97e8c96e2ecf04466ac4bce99fcebe0c3ce9953fa3fc4f5a92ab6f60e122f58c9a"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-128"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; } // lib.optionalAttrs config.allowAliases { thunderbird-102 = throw "Thunderbird 102 support ended in September 2023"; 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 bf0b709abdcf1..f052e69305916 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 = "232.240626.0"; + version = "235.240712.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE="; + hash = "sha256-IhGfpHzK853b21oqhlfvXVrS1gl/4xgrZeWvBCIL1qg="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7132eca55913b..7370ddd6e2013 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.19"; + version = "1.4.20"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-I8QeE8b/68qt4sNsn9RivyX2I+SBuwYnz+CT4DpVXIo="; + sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e68e8f8fe96b9..6bd0f38ba6f45 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; { @@ -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..d89c173550468 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; + cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; buildInputs = [ notmuch diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index ad33172801690..0dcfeaabf677e 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 diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 91ec4ee9c26ef..f33ef641abf23 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 @@ -53,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; @@ -72,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 \ @@ -104,7 +104,7 @@ let owner = "mumble-voip"; repo = "mumble"; rev = "v${version}"; - sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; + hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; }; 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/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index e1392d00f4ad5..37fc5bdb25aa0 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.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg="; + hash = "sha256-gZeIZTEO/5jKUEGRl91Px44tVTerIm1o4kIGj5Y9pb8="; }; - vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8="; + vendorHash = "sha256-ZaHgB9nxOYOVE/kjb62f3Kyow9mpXFUc1Gtvsnu28k8="; inherit subPackages; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 59334f61dad24..5c0cdf4455a88 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.1"; + # make sure an official release has been published on + # https://github.com/nextcloud-releases/desktop/releases and re-check the + # hash afterwards + version = "3.13.2"; outputs = [ "out" "dev" ]; @@ -34,7 +37,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-Ux0zbOribIbrABQQtUbp6NK96YYaHgREQUmgm9/MQaI="; + hash = "sha256-hZjmAdh9QQ2bAIYL3K7scl59kz9Wxnv9f6rKMeuKb7U="; }; patches = [ diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 8d7889663fff7..081f7d96c1aa2 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -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/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 49ce4fae12173..18d791f534025 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 ]; @@ -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/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 5386c6636add0..67dab32e113f1 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,6 +13,13 @@ 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; [ diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 3ca23647251a1..abcc69ec12402 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils -, substituteAll, nixosTests, perl, fetchpatch, writeText }: +, substituteAll, nixosTests, fetchpatch, writeText }: let version = "01497"; @@ -45,60 +45,17 @@ in stdenv.mkDerivation rec { 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"; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - # 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()} } - } - } - } - ''; + # using reproducible archives breaks the build + gradleInitScript = writeText "empty-init-script.gradle" ""; - buildPhase = '' - gradle jar -Dorg.gradle.java.home=${jdk} --offline --no-daemon --info --init-script $gradleInit - ''; + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; + + gradleBuildTask = "jar"; installPhase = '' runHook preInstall @@ -108,7 +65,6 @@ in stdenv.mkDerivation rec { install -Dm555 ${wrapper} $out/bin/freenet substituteInPlace $out/bin/freenet \ --subst-var-by outFreenet $out - ln -s ${deps} $out/deps runHook postInstall ''; diff --git a/pkgs/applications/networking/p2p/freenet/deps.json b/pkgs/applications/networking/p2p/freenet/deps.json new file mode 100644 index 0000000000000..83ae9f333ae51 --- /dev/null +++ b/pkgs/applications/networking/p2p/freenet/deps.json @@ -0,0 +1,240 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "io/pebbletemplates#pebble-project/3.1.5": { + "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" + }, + "io/pebbletemplates#pebble/3.1.5": { + "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", + "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java/dev/jna#jna-platform/4.5.2": { + "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", + "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" + }, + "net/java/dev/jna#jna/4.5.2": { + "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", + "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.59": { + "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", + "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-library/1.3": { + "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=", + "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/mockito#mockito-core/1.9.5": { + "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", + "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" + }, + "org/objenesis#objenesis/1.0": { + "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", + "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" + }, + "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/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + } + }, + "https://mvn.freenetproject.org": { + "org/freenetproject#freenet-ext/29": { + "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/android/tools#common/22.7.2": { + "jar": "sha256-6ttGKrkD+J2cPRFUxxHwRni3mSHGgmjTQYuba/NEMk4=", + "pom": "sha256-8zhO5T3Z3fYzOUMDUs3/+WY225ZP0mzxaNvVOt8fSQg=" + }, + "com/android/tools#dvlib/22.7.2": { + "jar": "sha256-/a4X4WbglSc1P37HGgt/PZPMBhxkf8p73ZZjJjO7Z+s=", + "pom": "sha256-Q1HWW5dIC0kjSGhulIFI7Hp/AOVXbZjC9DHPIBxDSpw=" + }, + "com/android/tools#sdk-common/22.7.2": { + "jar": "sha256-l/7SZpQEdLQTNBcmSalIWvV6Qqmsmrcm2S27X6SjPpU=", + "pom": "sha256-Ln4pJV6PBhvVs706Vj7/nqu2xqmLSIHwlpzklOkrhD4=" + }, + "com/android/tools#sdklib/22.7.2": { + "jar": "sha256-qFsaBA/dxaWEWjBuaOK4qx/+LFMS4buyoosTvxOE7RU=", + "pom": "sha256-mGlFT4xtSEwnyYC4eIETnMx/7/Q+7g+MGkhtsbXUPSM=" + }, + "com/android/tools/build#builder-model/0.9.2": { + "jar": "sha256-Utfe2Ho/LgcOOyj3IdFPXtik4s6cVFlT2C3cp0XQ/pU=", + "pom": "sha256-8F2KJ7WoFcgydCbzj7DeW6zpgmAAtE4iR+vTxtcnw28=" + }, + "com/android/tools/build#builder-test-api/0.9.2": { + "jar": "sha256-+i52Ho1fu3bUsVJVeE2nx89qaGW03e1IDXpCxvjqbgo=", + "pom": "sha256-c2xEI3eXn7+LDkxMnGSI6Gg7In6VIXekA6LH+4SB2Fg=" + }, + "com/android/tools/build#builder/0.9.2": { + "jar": "sha256-Vbz5bMADnI7bU9GRVeq+1NfgGgkbZv6zrbb/acJ59Bk=", + "pom": "sha256-UaLeg+swvMwBEbTd3mkxvswC5HwpuqNgm9ErCm7kvvg=" + }, + "com/android/tools/build#gradle/0.9.2": { + "jar": "sha256-gX/QEcuyw4yF/39EWHwTsUCoRUrfk3/Do/KKZggULII=", + "pom": "sha256-DCk9CiNuuQYLtf32UJGE98BPy2xFGXbKkS0LysbBt7Y=" + }, + "com/android/tools/build#manifest-merger/22.7.2": { + "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=", + "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0=" + }, + "com/android/tools/build/gradle/maven-metadata": { + "xml": { + "groupId": "com.android.tools.build", + "lastUpdated": "20170306221012", + "release": "2.3.0" + } + }, + "com/android/tools/ddms#ddmlib/22.7.2": { + "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=", + "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY=" + }, + "com/android/tools/external/lombok#lombok-ast/0.2.2": { + "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=", + "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074=" + }, + "com/android/tools/layoutlib#layoutlib-api/22.7.2": { + "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=", + "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM=" + }, + "com/android/tools/lint#lint-api/22.7.2": { + "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=", + "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM=" + }, + "com/android/tools/lint#lint-checks/22.7.2": { + "jar": "sha256-Hrp9wZ3RAhpR3BkT5obPwe4yrP3e26H3NZf2X6ghXzM=", + "pom": "sha256-5/n3/kXskHm5S/kCh6xSbyGQ6/vJyU3LJsGhsG2+uM8=" + }, + "com/android/tools/lint#lint/22.7.2": { + "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=", + "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc=" + }, + "com/google/guava#guava-parent/15.0": { + "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js=" + }, + "com/google/guava#guava/15.0": { + "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=", + "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs=" + }, + "com/squareup#javawriter/2.2.1": { + "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=", + "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA=" + }, + "commons-codec#commons-codec/1.4": { + "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=", + "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "kxml2#kxml2/2.3.0": { + "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU=" + }, + "net/sf/kxml#kxml2/2.3.0": { + "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", + "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" + }, + "net/sf/proguard#proguard-base/4.10": { + "jar": "sha256-pCU0cXeR5+2oMDYTNzWP4siLCRmAEfnu0epVkfNUTyQ=", + "pom": "sha256-iYTsEfuzfC9fj1aDRT2mLVtGYU8VxVBxJUH9isYqnWs=" + }, + "net/sf/proguard#proguard-gradle/4.10": { + "jar": "sha256-ijb/GXYIYcPPWijb4aadk+aEfi5aadg5PQhkQv8R0Ms=", + "pom": "sha256-kZNouji8XuG6t3YYOqf2HKBaDg1syDbiOhByk59mK5E=" + }, + "net/sf/proguard#proguard-parent/4.10": { + "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache/commons#commons-compress/1.0": { + "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=", + "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/httpcomponents#httpclient/4.1.1": { + "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=", + "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1": { + "pom": "sha256-UhW2SHmMbI2bnN42QtO/taTMiUt8hBEAQ1Ln3l0RmCc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1.1": { + "pom": "sha256-R1KE5emVUm1+dxUTSgdBLOctWYUEY0I4P13kGIoCKlM=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.1": { + "pom": "sha256-T3l//Zw9FW3g2+wf0eY+n9hYSpPHBDV2VT38twb2TeQ=" + }, + "org/apache/httpcomponents#httpcore/4.1": { + "jar": "sha256-POON5R9OJGaMbRhAV6jQhUH56BXS0xnQ9GLwgwkrKc8=", + "pom": "sha256-T8hq+jjpyfqwmcz0XCvHQ9RT5qsiJJCr/oZxl1w8cyc=" + }, + "org/apache/httpcomponents#httpmime/4.1": { + "jar": "sha256-MWKVZhSOikdoiuQ7Qgq8Ps14PtFbM768AIJL8kybFao=", + "pom": "sha256-2zzZW+wQAWBeFlPyhD6FQucS+iu2cv2cjBrOhsV2c9E=" + }, + "org/apache/httpcomponents#project/4.1.1": { + "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.48": { + "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=", + "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0=" + }, + "org/bouncycastle#bcprov-jdk15on/1.48": { + "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=", + "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI=" + }, + "org/eclipse/jdt/core/compiler#ecj/4.2.2": { + "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=", + "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0=" + }, + "org/ow2#ow2/1.3": { + "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" + }, + "org/ow2/asm#asm-analysis/4.0": { + "jar": "sha256-3VOXq69XIxBJrLEBxFHlmKlHpd0YKYMneVNc/cK68U4=", + "pom": "sha256-7U8zeG58CrtuaOYcK047V7WLFOqu/ewxtwkCXja3/Hg=" + }, + "org/ow2/asm#asm-parent/4.0": { + "pom": "sha256-QFr+Cu5AfJEcXkqoCpSdtVOS8XleE8oCrnKdFV30rBg=" + }, + "org/ow2/asm#asm-tree/4.0": { + "jar": "sha256-2LAWoiBbLhQdtCbAQdKubQ1ButBQBioqUXWiWdNkF9o=", + "pom": "sha256-eskVIWBDQDSQMyuS1unIoqd5QIyy1kgdqdOjXtGKLvw=" + }, + "org/ow2/asm#asm/4.0": { + "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=", + "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + } +} 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/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index c08f6ae4b64b1..795f6969ff48c 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ 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/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 e4e44f79aea5f..bbfc978eef5b0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,5 +1,4 @@ -{ 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-keyring @@ -7,13 +6,13 @@ 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,13 +20,13 @@ 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/"; }) ]; @@ -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/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/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 7c5e9b3651868..dd27a22168b47 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 @@ -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 = [ 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/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index fe0e032dd2247..f27a570123665 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,45 +1,65 @@ -{ 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 ]; + + 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" + ''; - nativeBuildInputs = - lib.optionals pythonSupport [ swig python3 ]; + nativeBuildInputs = lib.optionals pythonSupport [ + swig + python3 + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.setuptools + python3.pkgs.wheel + ]; - buildInputs = [ openssl libsamplerate ] + buildInputs = + [ + openssl + libsamplerate + ] ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ + AppKit + CoreFoundation + Security + ]; - env = lib.optionalAttrs stdenv.cc.isClang { - CXXFLAGS = "-std=c++11"; - } // lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_LINK = "-headerpad_max_install_names"; - }; + env = + lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } + // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; preConfigure = '' export LD=$CC @@ -51,52 +71,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.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 +129,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 +142,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/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/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index aa96c72e400d8..231defdc34c5f 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 diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index b25e090bf8b48..0637526d1616d 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.5.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-8yWMnwJbvyUiEuX+2bEim1IeqPx20u9yvNIVe7MC/ZQ="; + hash = "sha256-LdgHQ2lb3cde4cX4aIwHvSo0q9iwpLzaWDHbv1/rneE="; }; postPatch = '' 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/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 796959139d480..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}"); 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..efe9ea9735c8a 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.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-JjicVgDqiuIuVn7swbVekqQ+3Ly64Nd7qKu5UymTEYE="; + sha256 = "sha256-Q/Dimm4oJH6mh0mCbVhkqJuRI9wytGmeBGNjMWiPil4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 20cdf386257ec..604ba4772710a 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -7,6 +7,7 @@ }: let python = python3.override { + self = python; packageOverrides = self: super: { django = super.django_3; }; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 4110db3022eb1..c506f7f9b7e33 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.69"; + version = "3.71"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-stbp4SqBXTZv5QXDwslsg/Y4lhkPGbwcslWZTR3c2v0="; + hash = "sha256-urYpcFZtZCEQ6nGcDJ2gq+HYnMcEencVn/jxt0HUl/U="; }; - vendorHash = "sha256-OfLC7a2+YM95F/anrwvhTw4mc72ogBZfLEPDUKMn9IE="; + vendorHash = "sha256-2YvIK0wIwCELcaBUZN2SbTngdFO717YY+83NSIzae0w="; subPackages = [ "weed" ]; 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 655626d07e262..7cadaee0e2038 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { mainProgram = "qtwirediff"; homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ ]; + 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..191924ac70029 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.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.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ @@ -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.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..79df10e20751f 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -3,28 +3,30 @@ , 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 ]; @@ -62,7 +64,7 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.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/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/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/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 67aea9941676d..0c172f31d06ce 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.107.2"; + version = "1.108.3"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-1VO0kPR9kdterLfLRJrtKfIowppApBCZZaY7yTCncrc="; + hash = "sha256-ZCQRzbu1cNSid/A/NOJm0p/voGP1sXqhxKcSgnu16EI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-CyUthAKwJwocZtvNEy5p/1WmqT4DIl0jN63hiQncrwY="; + vendorHash = "sha256-0ukCBIQayJWPWLDFqo23OFTfPJySgD5fftL0b6p0pFY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index b816da9e4b5cb..956dd598d4c3b 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -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..c30bb61a410f1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.8"; + version = "1.27.9"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM="; + hash = "sha256-9PKx5jxntG1QjDA+6XySxGahE1IrKKBl/Xk5ZaCAf5I="; }; - vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0="; + vendorHash = "sha256-Xv5x+/1lx8nyXw72eEHz7+qnkyZfPAnBtDRrOrD2l+g="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when 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 7df9b7224408e..e302fd7ddb5fe 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.5"; + version = "0.13.0"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-EwfICUKlDnlkD1vxR1jpNybvUG4mOHfRRgk8VB9T+hs="; + hash = "sha256-uaHForU+0dAkLPczHr6ZBpNZ6iirvsje+6i8rHrNXdQ="; }; - vendorHash = "sha256-lEGFOBR0d8IfqBYdrC8awRhGcPqt0y4oOWU+xu4ClfE="; + vendorHash = "sha256-RvGKPIXdkeTdpFraxie76xrtfqRsIpzpBricEQZNFYc="; subPackages = [ "cmd/trayscale" ]; @@ -50,7 +50,7 @@ buildGoModule rec { description = "Unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "trayscale"; platforms = platforms.linux; }; 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 691328e3e6607..7a9bc8c6094e0 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-yShTvGcmWwa5bhZP0QYgDtOvTAdnWsFTBnHB309ya/s="; + x86_64-linux = "sha256-KLOI0lG0rZbLS2uiONNlgyCkohzQhytRovAfrjnGuDI="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "10.0"; + version = "10.2.2"; 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..238bedd52be03 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 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/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 62315b6c2ae58..1df4815b6a28f 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -1,31 +1,46 @@ -{ 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-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk="; + }; + x86_64-darwin = { + urlSuffix = "macos-universal.zip"; + hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4="; + }; + aarch64-darwin = x86_64-darwin; + } + ."${stdenvNoCC.hostPlatform.system}"; +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.6.1"; + version = "0.6.6"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-a8oupvBtT3sKhboSeS/GbVSauKXx54J4WZd+PyIbuzU="; + 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.isLinux [ autoPatchelfHook ]; buildInputs = [ gtk3 @@ -36,35 +51,47 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - installPhase = '' - runHook preInstall + installPhase = + lib.optionalString stdenvNoCC.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.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.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.isDarwin '' + makeWrapper $out/Applications/AppFlowy.app/Contents/MacOS/AppFlowy $out/bin/appflowy + ''; - desktopItems = [ + desktopItems = lib.optionals stdenvNoCC.isLinux [ (makeDesktopItem { - name = pname; + name = "appflowy"; desktopName = "AppFlowy"; - comment = meta.description; + comment = finalAttrs.meta.description; exec = "appflowy"; icon = "appflowy"; categories = [ "Office" ]; @@ -76,9 +103,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/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/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/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/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 8d86d771d0aa8..c51fe700573ff 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchurl -, fetchpatch , aqbanking , boost , cmake @@ -28,12 +27,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.6"; + version = "5.8"; # 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="; + hash = "sha256-osgj+3ALnUWYaS7IE5SVm944jY7xke/k6iwCQmu1JZM="; }; nativeBuildInputs = [ @@ -79,12 +78,6 @@ stdenv.mkDerivation rec { # 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 @@ -108,7 +101,7 @@ stdenv.mkDerivation rec { owner = "Gnucash"; repo = "gnucash-docs"; rev = version; - hash = "sha256-rQZoau466Bi/YpPj1XpSsm67FgTYhiMfZfogTtn+m1k="; + hash = "sha256-3b1Nue3eEefDi4WI+o3ATfrsQ+H/I+QwTr4Nuc9J7Zg="; }; nativeBuildInputs = [ cmake ]; 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/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/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index 28064da7fe4cb..f8f32ecec6ed5 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"; 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/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 9043d575fa060..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 diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 30e5f7864cd03..d5d48219beb73 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 @@ -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 @@ -142,14 +145,14 @@ , sonnet ? null }: -assert builtins.elem variant [ "fresh" "still" ]; +assert builtins.elem variant [ "fresh" "still" "collabora" ]; let inherit (lib) flatten flip concatMapStrings concatStringsSep getDev getLib - optionals optionalString; + optionals optionalAttrs optionalString; fontsConf = makeFontsConf { fontDirectories = [ @@ -197,8 +200,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; @@ -221,7 +224,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,12 +235,16 @@ 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: @@ -244,6 +252,11 @@ in stdenv.mkDerivation (finalAttrs: { # - the remaining tests have notes in the patch # FIXME: get rid of this ASAP ./skip-broken-tests.patch + (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 == "still") [ # Remove build config to reduce the amount of `-dev` outputs in the # runtime closure. This behavior was introduced by upstream in commit @@ -251,11 +264,14 @@ in stdenv.mkDerivation (finalAttrs: { ./0001-Strip-away-BUILDCONFIG.patch # See above ./skip-broken-tests-still.patch - ] ++ lib.optionals (variant == "fresh") [ + ] ++ lib.optionals (variant == "fresh" || variant == "collabora") [ # 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 (variant == "collabora") [ + ./fix-unpack-collabora.patch + ./skip-broken-tests-collabora.patch ]; postPatch = '' @@ -268,6 +284,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 = [ @@ -372,7 +391,7 @@ in stdenv.mkDerivation (finalAttrs: { perl poppler postgresql - python3 + python311 sane-backends unixODBC unzip @@ -464,7 +483,7 @@ 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 @@ -525,7 +544,7 @@ in stdenv.mkDerivation (finalAttrs: { "--keep-going" # easier to debug test failures ]; - postInstall = '' + postInstall = optionalString (variant != "collabora") '' mkdir -p $out/share/icons cp -r sysui/desktop/icons/hicolor $out/share/icons @@ -553,6 +572,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { inherit srcs; jdk = jre'; + python = python311; # for unoconv updateScript = [ ./update.sh # Pass it this file name as argument @@ -624,5 +644,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + mainProgram = "libreoffice"; }; }) 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..4fcb5585d72b5 --- /dev/null +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -0,0 +1,52 @@ +--- 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/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; ++ + // Load a document where the top left tile contains + // paragraph and line break symbols with redlining. + SwXTextDocument* pXTextDocument = createDoc("pilcrow-redlining.fodt"); +@@ -3057,6 +3059,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin) + { ++ return; ++ + // Load a document where the top left tile contains + // paragraph and line break symbols with redlining. + SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt"); +@@ -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; ++ + 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; ++ + #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/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..d9ef29364fc84 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -238,11 +238,11 @@ md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.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"; @@ -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"; @@ -630,11 +630,11 @@ md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.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.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; + sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; md5 = ""; - md5name = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb-libxml2-2.12.6.tar.xz"; + md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; } { name = "libxslt-1.1.39.tar.xz"; @@ -742,11 +742,11 @@ md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.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"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index a2ccc9be28ac6..0f9f549052708 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 = "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-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 7aa7e08105695..69376e497a117 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 = "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-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 42740ef1243db..b969430601824 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 = "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-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 8996537117f8e..ede95eca68ce5 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.2.5.2" diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index f9e71ea799369..8bdc4617e1487 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "1l543k603mbr3rnwlnv9j52mblmvkgj9y49w4v7w3xm8b15331rs"; url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.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..d75aeb3063514 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"; url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-7.6.7.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..fffb89108f09e 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,4 +1,5 @@ -{ +{ fetchurl, ... }: +fetchurl { sha256 = "1bzmpa04bv8afhl3p68dlicamh0zyckmbdgqb3v72fjmx2h8i64a"; url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz"; } 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..d2e62f8e5c74c 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 @@ -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 a639c97b96773..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.117.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-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM="; + 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..46c318ffbd11f 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.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..14f3c4098102a 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -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/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 6aa2af7dba4c3..1a2c11cf2023d 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -24,19 +24,20 @@ }: let - version = "2.10.2"; + version = "2.11.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-LwWdgoVlZjL5o+T8zzU9jkYaQbdiZokrCGn8ZTIQ4OQ="; + hash = "sha256-2VmV8Z8TDacc4qZePG87ZgnBydLdm+anpmk8gFKbSLM="; }; # 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 +51,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,7 +75,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE="; + npmDepsHash = "sha256-gbHavMUmsZaRSfBkdrrNpTO0R8zacb8110U8n5Y09oU="; nativeBuildInputs = [ pkg-config @@ -231,6 +220,7 @@ python.pkgs.buildPythonApplication rec { pytest-django pytest-env pytest-httpx + pytest-mock pytest-rerunfailures pytest-xdist pytestCheckHook diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 3a084c358469a..f9227354deea0 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.10.5"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-iQo7ETz5j/Uy5a96XFRkZ0U67dTHWEYLsr/qUi79Y4E="; + hash = "sha256-tjU7/JZjJqH9H/EWMoAbRurJtIDv8BTT938EnJicTv4="; }; 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/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 8003317fc2fb4..9fe183058e01a 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -8,7 +8,6 @@ , qtsvg , qtwayland , qtwebsockets -, qt5compat , makeWrapper , wrapQtAppsHook , botan2 @@ -21,14 +20,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.7.0"; + version = "24.8.3"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-yDWm6d3kZwBEo0i7CSni4EOA4H+lAuYSzmANi/q7HxU="; + hash = "sha256-lbNJT6IbIgTYLpsMWK6Nk0XXhw1De+wZgrH4DE1vDKg="; }; nativeBuildInputs = [ @@ -45,7 +44,6 @@ stdenv.mkDerivation { qtdeclarative qtsvg qtwebsockets - qt5compat botan2 ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; 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/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 2510d42b9a82a..2e2a8a0d7ac1d 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 = "2.0.30"; 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-oo1ssIU6nYMBoEc888xAiTS7PHuEkoaC7KsPRTwL0ZA="; }; 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 2b9f66dd661c8..3667414e9296d 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-23"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "91dea2ba714e9b1fb6ab660ddd295653218bdebc"; - hash = "sha256-pn+Ki60lBL+2sKXnhYEly8/Yi94mhiMDxTnWZi4ZFOk="; + rev = "0d3eff693f23929e8b53317b08df9da2d610994f"; + hash = "sha256-c5HMxFxDD439kKguW8Mwkjmnavh2MSSiODTgrnZcbjo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index d2db214a4ef88..2e16d0d4cc84c 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.2"; + version = "7.2.3"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; + hash = "sha256-W5DXOLUr4c9w9Zcp9i5esNjSSIMewe+NJGh+h3PiD30="; }; nativeBuildInputs = [ 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/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/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/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..02c4e74eb855b 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -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..f1177fe5419ef 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-w/WAcTorLCzqHLwQjbZwaHGytLXHr4eW7Yx768on67Q="; + hash = "sha256-EaHVHfyhQTxxLtb3wsJV7Fea2jyENnfn6Lv/3GwAKdk="; }; nativeBuildInputs = [ 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 337038fd32c2b..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; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "anytone-emu"; }; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index c113f365aef53..62fbba4e9867f 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "0.4.0-unstable-2024-05-24"; + version = "0.4.0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "e17c021ba4fc39eea8a2a1de37ef04a0d1253090"; - hash = "sha256-YvIRo7g9fxnlf8og5CM2JLf8DeADVkcHdvb4ppS1veE="; + rev = "f28814fff0566dcf6f93ac5b7a79d6d594202757"; + hash = "sha256-SQ0j9DGJc48TsaUaesixJT/pMBm9NGw22qapSokj9r8="; }; buildInputs = [ glib @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { pyserial requests six + suds wxpython yattag ]; @@ -47,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { description = "Free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.emantor ]; + maintainers = with maintainers; [ emantor wrmilling ]; platforms = platforms.linux; }; } 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/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/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/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 37533bb05d34d..67cc2d6c8ebf8 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 = { @@ -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 b6a8ebd2dd8ee..0000000000000 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ /dev/null @@ -1,311 +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 - pyqt5 - ]; - }; - 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 9d05e1151bd8d..e7efa57428b8b 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"; }; @@ -312,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..fe75f6037f375 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}) + 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 @@ -123,7 +123,7 @@ in { 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/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/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 6217a169ef256..2ebc0d30ff6c2 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, @@ -22,13 +21,13 @@ 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 = [ diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 7ec6756f20aa3..b8df780214956 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.37.2"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg="; + hash = "sha256-cphbM9dl+Ls2i3H5QjOugW0nXqa9bp5LpcnE9ACjqWM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index d9b03d0573698..e31c5ea369b0b 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; + hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; }; buildInputs = [ diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 4f68ea70b345f..864fce4d1eebc 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.21.4"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-TeQteQ+RAnG1J0m4BEYJCrALkfplz3gO5IBi0GxTWmI="; + hash = "sha256-GINgI4u87Ns4/5aUWpeJaokb+3Liwjjibr02NGcF10c="; }; nativeBuildInputs = [ 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/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/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/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/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 426a7f18dff3f..87118beec99f0 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -20,6 +20,8 @@ , qttools , exiv2 , nlopt +, testers +, xvfb-run }: stdenv.mkDerivation (finalAttrs: { @@ -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..21dbf69407f21 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 = [ 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/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/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/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 3a7e009cc1561..ce39ca8f425ac 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.12.2"; + version = "2.13.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-dnvs+niNo8VPuOk9uODezLxdghwutLuhgG5Jyxi8mW0="; + sha256 = "sha256-JxV7ZxA3/YMG6ziYOA8QiBVth9UunVGJLTy1E110y6w="; }; appimageContents = appimageTools.extractType2 { 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/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 7820f177bfb7b..53fc807776126 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="; }; 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/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 807af7ce488ac..96418346eeb9e 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 = '' diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index ef79fb11a824d..e54d3c9ba7a12 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"; @@ -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/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/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/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/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/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index c379e432bdeb2..b7f06898504f1 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -59,7 +59,7 @@ 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; }; 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/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 61266a9f02854..af63e2a77568b 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 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/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/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..7fc5da8dfa89a 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -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 \ 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/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/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix index 415cc29812d3d..950182954af1d 100644 --- a/pkgs/applications/science/electronics/dwfv/default.nix +++ b/pkgs/applications/science/electronics/dwfv/default.nix @@ -6,10 +6,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit version pname; - sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7"; + hash = "sha256-JzOD0QQfDfIkJQATxGpyJBrFg5l6lkkAXY2qv9bir3c="; }; - cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy"; + cargoHash = "sha256-nmnpHz9sCRlxOngcSrW+oktYIKM/A295/a03fUf3ofw="; meta = with lib; { description = "Simple digital waveform viewer with vi-like key bindings"; diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index 2da80512e2b2c..e15ef3277a664 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 = [ @@ -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/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 4dd8fa743121b..459523ea61690 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -25,7 +25,7 @@ , withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true -, python3 +, python311 , addons ? [ ] , debug ? false , sanitizeAddress ? false @@ -122,10 +122,14 @@ let else versionsImport.${baseName}.libVersion.version; wxGTK = wxGTK32; - python = python3; + # KiCAD depends on wxWidgets, which uses distutils (removed in Python 3.12) + # See also: https://github.com/wxWidgets/Phoenix/issues/2104 + # Eventually, wxWidgets should support Python 3.12: https://github.com/wxWidgets/Phoenix/issues/2553 + # Until then, we use Python 3.11 which still includes distutils + python = python311; wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; - addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; + addonsDrvs = map (pkg: pkg.override { inherit addonPath python; }) addons; addonsJoined = runCommand "addonsJoined" @@ -157,7 +161,7 @@ stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; - passthru.callPackage = newScope { inherit addonPath python3; }; + passthru.callPackage = newScope { inherit addonPath python; }; base = callPackage ./base.nix { inherit stable testing baseName; inherit kicadSrc kicadVersion; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b3ddbd5b604fe..3d66c909036e5 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.4"; src = { - rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; - sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; + rev = "5609722002776982320b6a8fbe6d096bbccf469b"; + sha256 = "03971przr1kzmkr302qzx30mmp92mkwg29dwjvzayc522iskxcbx"; }; }; libVersion = { - version = "8.0.3"; + version = "8.0.4"; libSources = { - symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; - symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; - templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + symbols.rev = "967a2828636d21f90ccc28dcfdc0e48508101c9d"; + symbols.sha256 = "1s8mkxb3ncb0w8z5q8jzhryb0yri7g51vx29qykqwv4ksra1f07i"; + templates.rev = "9c51a73b2e2fc4ea75d8b8be0a78bc9fb1785433"; templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; - footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; - footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; - packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; - packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; + footprints.rev = "a2aa9b5aea64c0efad9a31bc9ca88d48c0203752"; + footprints.sha256 = "1aqdb7mamz8xzz1qrw3qnvnaj97asb8z37w1cjz6y06sjcznlihn"; + packages3d.rev = "5430edd57b3a66fe69288aa8fda714f9732a7f52"; + packages3d.sha256 = "0vixdcldvnl8lr8bq3rc748q3vhx1lr2a0i071w914xyn983z9vz"; }; }; }; 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/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index dd58794ed182c..d4c3c68991a22 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.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..0cfaa31613476 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.13.1"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-9nqho+iDqy8oQLSxBppXoafzEuS6AkcUuqEY3xxfFs4="; + hash = "sha256-mi/ruW+KLOeT6QpyRr+ZRtyOAyXsoKiO5WKAuXz5Wc4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 4aa9ab2b66f29..60ee6cef77530 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; }; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 16659892a6ee7..0c929fe47c18e 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -15,7 +15,6 @@ , clp # for or-tools , eigen , glpk -, gtest , lcov , lemon-graph , libjpeg 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/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 92f8fa52b91f9..1bed876157569 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,31 +1,57 @@ -{ 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... checkTarget = "test"; @@ -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/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 93c155038a22b..85cdafb660575 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 }: diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 62ffc099dc6cd..9d4c6fc6a4091 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -4,7 +4,7 @@ , libX11 , libGL , libGLU -, freeglut }: +, libglut }: stdenv.mkDerivation rec { pname = "antiprism"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + buildInputs = [ libX11 libGLU libGL libglut ]; meta = with lib; { homepage = "https://www.antiprism.com"; 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/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/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..0cd5e90cbb504 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.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/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 2c63edc1e7d49..81be0baf5cde7 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -62,7 +62,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 = [ ]; mainProgram = "lean"; }; }) 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/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/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 6bca5acb796f6..0d795611b95a8 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "chipsalliance"; - repo = finalAttrs.pname; + repo = "surelog"; rev = "v${finalAttrs.version}"; hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag="; fetchSubmodules = false; # we use all dependencies from nix diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 50850d4dbf82e..72b55ffbcd7ab 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "chipsalliance"; - repo = finalAttrs.pname; + repo = "UHDM"; rev = "v${finalAttrs.version}"; hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok="; fetchSubmodules = false; # we use all dependencies from nix diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index cc512acad7937..ba95bc2239ab2 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.0"; 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-ZOmc83OZVHIt/Sq6KQWuG4/xyeaETL8qJmmSjGcqL60="; }; 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/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1a6e9351d3a79..9dbbe8455d1b2 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; + cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles @@ -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..b6fa984e7d5b0 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 ]; @@ -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/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..0f36c4783df78 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -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/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 38b668804ad16..40169a72e4a6f 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.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..18000c147d87e 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -27,7 +27,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/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/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/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 5a96bf1a26252..c1c10f8937ce0 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 = '' 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/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index ba47acb80e03f..b1db5ce31a791 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.2.0"; + version = "5.2.0.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-suJUPeWLX+da0lQdvsDgSBRCBYmog+s4+n/w0PnPijs="; + hash = "sha256-kzOxOCZmu4mYYgegRBU8SMAkTiE4p1AugVAeZa8yDDE="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; 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/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index f95e08c51ff4d..e886f6645468b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -5,6 +5,7 @@ , sage-docbuild , env-locations , gfortran +, ninja , bash , coreutils , gnused @@ -63,6 +64,7 @@ let "@sage-local@/build" pythonEnv gfortran # for inline fortran + ninja # for inline fortran via numpy.f2py stdenv.cc # for cython bash coreutils diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index de0c2e3b1e20e..b21bb07e6a646 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -61,19 +61,9 @@ stdenv.mkDerivation rec { 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,12 +73,40 @@ 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/37763, landed in 10.4.beta2 + (fetchpatch { + name = "scipy-fault-tolerance.patch"; + url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; + hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; + }) + + # https://github.com/sagemath/sage/pull/37492, landed in 10.4.beta5 (fetchpatch { name = "singular-4.3.2p14-upgrade.patch"; url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; }) + + # https://github.com/sagemath/sage/pull/37949, landed in 10.4.beta6 + (fetchpatch { + name = "conway-polynomials-new-len.patch"; + url = "https://github.com/sagemath/sage/commit/c9f5b45179e92ea0de1e0dbe0f47464010902851.diff"; + hash = "sha256-DwN2UIX8dxfxjIiqVvMdGbIxJ7CR/Ag2XUmS5vUKFTs="; + }) + + # https://github.com/sagemath/sage/pull/37967, landed in 10.4.beta6 + (fetchpatch { + name = "conway-polynomials-ell-point.patch"; + url = "https://github.com/sagemath/sage/commit/4e0bbaf90262a42f8ea14d5bcfed65f9d1787f54.diff"; + hash = "sha256-9gXydi1A+n7+K8YpH0PB8l/OMexhgO2F5NccU0cK+ls="; + }) + + # https://github.com/sagemath/sage/pull/38100, landed in 10.4.beta8 + (fetchpatch { + name = "sphinx-7.3-update.patch"; + url = "https://github.com/sagemath/sage/commit/e1b22690db42885423be5049246eb71ff52bdfef.diff"; + hash = "sha256-04KAyz8+0pJbRV8Ld0bNX1OoEx/35gIh3Nff+6n8QUU="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; 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..f6ec20faff594 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 = [ diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index d1b17eccee23b..ee84ae440b304 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -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 diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 685bc1bff3b18..4ce49e6cad4ca 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 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/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/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 0c559a530e089..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.2"; + version = "8.0.4"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-e0zEdiN3QQHj6MNGd1pfaZf3o9rOpCTmuNSJQb3sss4="; + 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/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 7f28c8d1b1463..bb2c3c0abe30e 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -2,7 +2,7 @@ , autoPatchelfHook , dpkg , fetchurl -, freeglut +, libglut , gcc-unwrapped , libGL , libGLU @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut gcc-unwrapped.lib libGL libGLU 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/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 35f46f7a4552b..57c4367d2a822 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "cdcseacave"; repo = "openmvs"; rev = "v${version}"; - sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; + hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b94f23671024b..6d169db23b925 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 ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 6b5917e163287..ae51d55168a9f 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 ]); # 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/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/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/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 6f5be3df816eb..ad50200c1a839 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -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; }; 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/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/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index d4a7a961d3984..f36d316164aac 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -16,14 +16,14 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"; - hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; + rev = "4447c7562e3bc702ade25105912dce503f0c4010"; + hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "e45585a4b8e75c28479fa4107182c28172799640"; - hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY="; + rev = "7c8ed6b082aa3c7a3402f18e50da4480421d08fd"; + hash = "sha256-xX3o4wX7RUvw1x2gOlT6sGhutDYLBZ/JzFnv68qN6E8="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -34,14 +34,14 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b"; - hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY="; + rev = "33d0937c6bdf5ec999939fb17f2a553183d14a74"; + hash = "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY="; }; googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "f8d7d77c06936315286eb55f8de22cd23c188571"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; + rev = "b514bdc898e2951020cbdca1304b75f5950d1f59"; + hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.1.6"; + version = "3.2.2"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU="; + hash = "sha256-UUPB7AY6OYWaK5uBu92kmoIE116AfFa34sYmF943AOU="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index a999a719e2e40..c2ee629d77ba9 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.4.0"; + version = "4.4.1"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; + hash = "sha256-FdF9QQYCF7HbmjvUQgV6HytJo2Aje2OEDPO2GSl1dqE="; fetchSubmodules = true; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 ]; + maintainers = with maintainers; [ lopsided98 pandapip1 ]; mainProgram = "QGroundControl"; }; } diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 928548e7e7183..ced330bd647ed 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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..5de1166e116dd 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.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 [ @@ -174,7 +179,7 @@ mkDerivation rec { 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/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/glances/default.nix b/pkgs/applications/system/glances/default.nix index 3e387f34a7341..6d8899440d4a3 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -26,15 +26,14 @@ 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 diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index fdf353646717e..55544e5f461f0 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; + hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index d3bec7e306d58..5c8714677ad98 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; [ srgom romildo ]; }; } diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 6630cbaa1258f..8a33d222855eb 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -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/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index a52a1362ddc91..1bb165101e41e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -23,8 +23,8 @@ , zsh , fish , nixosTests -, go_1_22 -, buildGo122Module +, go +, buildGoModule , nix-update-script }: @@ -41,7 +41,7 @@ buildPythonApplication rec { hash = "sha256-5ZkQfGlW7MWYCJZSwK/u8x9jKrZEqupsNvW30DLipDM="; }; - goModules = (buildGo122Module { + goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; vendorHash = "sha256-NzDA9b3RAfMx+Jj7cSF8pEsKUkoBECBUXl2QFSmkmwM="; @@ -80,7 +80,7 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs - go_1_22 + go ] ++ lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. 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..178677af60118 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -26,12 +26,16 @@ , withWayland ? !stdenv.isDarwin , wayland + +, testers +, rio }: let rlinkLibs = if stdenv.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,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.39"; + version = "0.1.1"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; - rev = "v${version}"; - hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw="; + rev = "refs/tags/v${version}"; + hash = "sha256-Hll9QpCN0/NDJ3tgJFnmNjfIotppGg5/BrHMxGmxOTo="; }; - cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU="; + cargoHash = "sha256-yyxJi0kK2d2I+9GncYHcRKbdngYSltDjsTuChqaDG/U="; nativeBuildInputs = [ ncurses @@ -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 = { @@ -118,5 +125,11 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; mainProgram = "rio"; + # ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ---- + # Test executable failed (exit status: 101). + # stderr: + # thread 'main' panicked at corcovado/src/sys/unix/eventedfd.rs:24:16: + # called `Result::unwrap()` on an `Err` value: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } + broken = stdenv.isDarwin; }; } 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/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/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 303c6d1b77da5..9595da4f4d754 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 = "392"; 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-TVc3LvCOr6n7doLbjQe+D+BRPljoR4wuyOm2JIbn/l4="; }; + 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/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/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/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 49829a2fd4bc9..b1b828d479598 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -86,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/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 28f8c94f5700b..a1c7361fd336d 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.54.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-vaB0K9LeMcCcJw5sqxe3bFgzDvhikjAej5vHkvhWqqY="; + hash = "sha256-wcEQcIDr+isuwDbwbgjGsioDjxAPfosu4vuJhro91DQ="; }; - vendorHash = "sha256-BnjWpxjkzSZKgeMR5iVdTKomsR93nSQVli4BDsPP4gw="; + vendorHash = "sha256-JZ30OXn5XdwLhz02fZgZltLw4FIM2wTlXzRgN8mhPjQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix index a3aa4218042c2..528bba032b9fa 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.9.13"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-8M8ovb3T7iSHXepG1eH3ByX+g5iVRl4/pctigQ4I0Pk="; + sha256 = "sha256-RXXDWz8sXvn0+6JFf6cHNRwg9xAGrCHGRM/M8MQpMko="; }; 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/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 8446d4dec1556..49d4a0a67ad25 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 ]; - 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-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..3a08072935c72 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , git , libiconv , ncurses @@ -15,31 +14,16 @@ 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 ]; 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..3f36fa142c1e7 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU="; + hash = "sha256-3SCfsLYB4qhvsVo0Ji4WPwIDGcMwQ4M4zKnCOsXGTS0="; }; buildInputs = lib.optionals stdenv.isLinux [ @@ -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-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index e7594eee2f21d..592074224f01c 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-eRSTF9Ldj00cQbUzHzdMihte0+W4nZ9T/qg/L/yes/w="; + hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 431c2326cf75d..b22825173ddb0 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,107 +2,107 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (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.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (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.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.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.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (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..8a8bfe610988b 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.0"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-iDnTjrVDH8qBYkvNjLHYmTaK8vScluDM4+W/5Rdo+Xc="; + hash = "sha256-hCZZPbkbkZcR2xFTECQWJl2MvSu8MnOznadaj0nKfSo="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix index b32b1aa52161b..1210e31894e17 100644 --- a/pkgs/applications/version-management/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-ignore/default.nix @@ -8,16 +8,16 @@ 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 diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 033b1c1416a1f..2eb80fa6b615e 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.1"; + version = "3.26.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-QcsBe1v2qiPR7svl5mQ/aro/X2PbpkJHNHnNAnQE9yA="; + hash = "sha256-UCaJiYLYeHI4R8IJfhgmT4Ji++CtQgvIJrKH1EXl83o="; }; nativeBuildInputs = [ installShellFiles ]; 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-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index cfed9952f79ec..9bc7e678d3ed6 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { 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-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..86978c7cf7cfe 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.46"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-f765TcOHL8wdPa9qSmGegofjCXx1tF/K5bRQnYQcYVc="; + hash = "sha256-eWRDarMx0QzTdTx3nFl1y12k25NqxGzuhLZd52Yr4qU="; }; # 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..9f20e7cab7b87 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.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.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-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 7b362cd7fb254..c1927d61e0261 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 = "15.0.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-bYCE3Ik0UbbjlZV8EY6pVRZzrTBp2uiZLJjO4UxfGE8="; + hash = "sha256-Gp2X9DCnueSVbeqFBNxLfvlXh4PzlybVdh8xKjaFICQ="; }; 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-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index fc16e778f28c9..6106477792696 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; }; - cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; + cargoHash = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7e008d656fde..66122420e9c7f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -1,9 +1,9 @@ -{ 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 @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.45.1"; + version = "2.45.2"; 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-Ub/ofrHAL+0UhAUYdTZe6rIpgx0w0M7F2JoU+eQOmts="; }; 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.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,7 +87,7 @@ 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.isFreeBSD then libiconvReal else libiconv) bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] @@ -293,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: { "PERL_PATH=${buildPackages.perl}/bin/perl" ]; - nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl; + nativeInstallCheckInputs = lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) sysctl; preInstallCheck = '' installCheckFlagsArray+=( 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 70bd9ab46c4f6..80c890046895b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,34 +1,82 @@ -{ 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, 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, + makeShellWrapper, + 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.2.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-NY7IgUt6Q27Pz1K46xL4LYFBwTJdT+fvsFDM2OhoPWg="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-60WB5P8rwnUFOhe9BW1sPyweuvwcXswoUUBo6V1VCxQ="; + hash = "sha256-e7zIMJNMdFy7/8zsV3nH1OT76xNznoSPRUVhoLfR6QI="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-XL5GWs+jhuUEiPlHQZ6MIfvDjhislBTCg+KssnB4s6g="; + hash = "sha256-YjGH9tKbJaYc5qENBCCpJGWWFJIQTD8O2H3onhMwGrw="; }; }; @@ -40,12 +88,22 @@ let 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; @@ -96,18 +154,26 @@ 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 adwaita-icon-theme ]; + nativeBuildInputs = [ + copyDesktopItems + (wrapGAppsHook3.override { makeWrapper = 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.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 e46f414f83d69..bf4eca6edb5f2 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.1.1", - "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf", - "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7", + "version": "17.2.0", + "repo_hash": "0g3g0nwxwv0h7i49qlv1835n9gh0cw8hikms62jl89nv1ca833yr", + "yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.1.1-ee", + "rev": "v17.2.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.1.1", - "GITLAB_PAGES_VERSION": "17.1.1", - "GITLAB_SHELL_VERSION": "14.36.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0", - "GITLAB_WORKHORSE_VERSION": "17.1.1" + "GITALY_SERVER_VERSION": "17.2.0", + "GITLAB_PAGES_VERSION": "17.2.0", + "GITLAB_SHELL_VERSION": "14.37.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", + "GITLAB_WORKHORSE_VERSION": "17.2.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index eb7499058674f..f41248123934e 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 = "17.1.1"; + version = "17.2.0"; 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-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY="; + hash = "sha256-thQ8Gufcygt3QEbIcmkroSuAky9kJ7f7hupim87AJdE="; }; - vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA="; + 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..b80f5de406681 --- /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.1.gl1"; + + # `src` attribute for nix-update + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "git"; + rev = "v${version}"; + hash = "sha256-1XtzM2dYbt3nsYOm5isgHnolfziyIC9yCTkfLJ95V6Y="; + }; + + # 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..b13c9a12706da 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.6.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-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI="; }; - vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; + vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48="; postPatch = '' # Disable flaky inmemory storage driver test 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 b2b29cf15a35f..463231b67fd0c 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 = "5.0.0"; + version = "5.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; + hash = "sha256-pkZWIsPWUDkjZo48mJ9N8LbMJJAHNI2Wf6X0F5+K23s="; }; - vendorHash = "sha256-2XdbTqNGt97jQUJmE06D6M/VxF9+vJAwMM/fF8MP2oo="; + vendorHash = "sha256-hFTvNh/N3z99O7dtAEiksonJcTn7Zj7Ijp68vfXEBw8="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 655bfe02ca0e3..5b75abd4c2d19 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 = "17.1.1"; + version = "17.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus="; + hash = "sha256-Rw78xDkOf/LDINsWqNGkMSjUXkbgVlSI6PTiZLHo2Wo="; }; - vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE="; + 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 698be436be8f9..eaaba0d4bd320 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.36.0"; + version = "14.37.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; + hash = "sha256-to4ZIFKEiM4FCznoLrvHua9/hIqiHcviALzfay+1rb8="; }; buildInputs = [ ruby libkrb5 ]; @@ -18,10 +18,12 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-Ebs9HnHhK4y6+vwLRvVwQnG8I7Gk6leBBezjkc+bhJo="; + 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-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 2b1677e1b8dc5..32db49747235f 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 = "17.1.1"; + version = "17.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-7iit/YJHxvrFYfnppwPox+gEAHea7/eq83vMPojWUWU="; + 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 d8f93f9280b18..9152b022d52e2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -48,6 +48,7 @@ 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.12.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -58,7 +59,7 @@ 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 @@ -73,6 +74,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-en 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 @@ -140,9 +142,9 @@ 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.3.4', feature_category: :api -gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api -gem 'graphiql-rails', '~> 1.8.0', feature_category: :api +gem '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) @@ -206,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.197.0' # 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.151.0' # 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 @@ -225,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.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 @@ -255,7 +257,7 @@ 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', feature_category: :scalability +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', @@ -306,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 @@ -331,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 @@ -372,7 +374,7 @@ 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 '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 @@ -386,6 +388,8 @@ gem 'gettext', '~> 3.4', '>= 3.4.9', 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,9 @@ 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 @@ -436,7 +443,7 @@ 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 'letter_opener_web', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler @@ -446,7 +453,7 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.16.7", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.17.0", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling @@ -458,8 +465,7 @@ 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 - # Locked on 3.3.0.5 until inspec-core is updated in Omnibus: https://github.com/inspec/inspec/pull/7030 - gem 'parser', '= 3.3.0.5', feature_category: :shared + gem '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 @@ -511,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 @@ -559,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.28.0', 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 @@ -594,7 +600,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.0.1', feature_category: :gitaly +gem 'gitaly', '~> 17.1.0', feature_category: :gitaly # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management @@ -647,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 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index aa9a829983a80..3a520314aa47b 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 @@ -174,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) @@ -289,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) @@ -304,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.197.0) + aws-sdk-core (3.199.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -312,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.151.0) - aws-sdk-core (~> 3, >= 3.194.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) @@ -412,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) @@ -449,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) @@ -503,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) @@ -565,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) @@ -604,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) @@ -684,14 +688,14 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.0.2) + 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) @@ -706,7 +710,7 @@ GEM mime-types gitlab-glfm-markdown (0.0.17) rb_sys (= 0.9.94) - gitlab-labkit (0.36.0) + gitlab-labkit (0.36.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.62) @@ -723,7 +727,7 @@ GEM 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) @@ -741,7 +745,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.28.0) + gitlab_quality-test_tooling (1.31.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) @@ -862,33 +866,32 @@ GEM 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.3.4) + graphql (2.3.5) base64 - graphql-client (0.19.0) + 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) + sass-embedded (~> 1.58) grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) @@ -955,7 +958,7 @@ 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) @@ -964,6 +967,7 @@ GEM 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) @@ -980,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 @@ -1026,13 +1030,13 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.6.14) - 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.1.0) @@ -1042,9 +1046,9 @@ GEM 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) @@ -1056,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) @@ -1064,7 +1069,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.3.1) + lookbook (2.3.2) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1155,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) @@ -1357,7 +1361,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.3.0) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1370,12 +1374,13 @@ 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 @@ -1407,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 @@ -1428,7 +1433,7 @@ GEM rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rack-timeout (0.6.3) + rack-timeout (0.7.0) rails (7.0.8.4) actioncable (= 7.0.8.4) actionmailbox (= 7.0.8.4) @@ -1469,6 +1474,8 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.94) + rbs (3.5.1) + logger rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1522,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) @@ -1606,15 +1613,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.16.7) + ruby-lsp (0.17.4) language_server-protocol (~> 3.17.0) - prism (>= 0.29.0, < 0.30) + prism (>= 0.29.0, < 0.31) + rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.6) - ruby-lsp (>= 0.16.5, < 0.17.0) - sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.11) - ruby-lsp (~> 0.16.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) @@ -1638,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) @@ -1650,7 +1660,7 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (3.0.1) + semver_dialects (3.4.0) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) @@ -1668,6 +1678,11 @@ GEM 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) @@ -1691,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) @@ -1721,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) @@ -1735,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) @@ -1919,14 +1935,15 @@ DEPENDENCIES 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.197.0) - aws-sdk-s3 (~> 1.151.0) + 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) @@ -1970,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) @@ -1980,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) @@ -1997,10 +2015,10 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.12.0) - gitaly (~> 17.0.1) + 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.17) @@ -2022,7 +2040,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.28.0) + 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) @@ -2047,11 +2065,11 @@ DEPENDENCIES 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.3.4) - graphql-docs (~> 4.0.0) + graphql (~> 2.3.5) + graphql-docs (~> 5.0.0) grpc (~> 1.63) gssapi (~> 1.3.1) guard-rspec @@ -2062,7 +2080,7 @@ DEPENDENCIES html-pipeline (~> 2.14.3) html2text httparty (~> 0.21.0) - icalendar + icalendar (~> 2.10.1) influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) @@ -2070,7 +2088,7 @@ DEPENDENCIES 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) @@ -2080,7 +2098,7 @@ DEPENDENCIES 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) @@ -2104,7 +2122,7 @@ DEPENDENCIES 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) @@ -2151,24 +2169,24 @@ DEPENDENCIES os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) - parser (= 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) + rack-timeout (~> 0.7.0) rails (~> 7.0.8.4) rails-controller-testing rails-i18n (~> 7.0, >= 7.0.9) @@ -2184,7 +2202,7 @@ DEPENDENCIES 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, >= 1.0.2) @@ -2194,7 +2212,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.16.7) + ruby-lsp (~> 0.17.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) @@ -2212,14 +2230,14 @@ DEPENDENCIES 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) @@ -2227,10 +2245,11 @@ 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) @@ -2241,6 +2260,7 @@ DEPENDENCIES 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) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f64d8b7daba95..10c3460eded18 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -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 = "146v6mhf8gma5vmzhz643sddwzhv3acapv7nhaisv4fcsf1lii1l"; + sha256 = "1lb21zc9fax6c97dq17h7bllm2cg39ms6hi9ya9z88lsdz8sgnj6"; type = "gem"; }; - version = "3.197.0"; + 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 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; + sha256 = "035d5q3csa1ac51xmxs2cqqibiifhm9sfdh71xjh0yrxnywdwqbh"; type = "gem"; }; - version = "1.151.0"; + 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"]; @@ -955,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"]; @@ -1104,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"]; @@ -1374,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"]; @@ -1716,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"]; @@ -1917,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 = []; @@ -2171,10 +2225,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ms9zz9j1zvabgdldpsn0s8g7v8q7vn3dkyvzh551iijzqcvlgc"; + sha256 = "0prcxb5ahqpxdswg2957d24k6w74rlnm0x7qlv5p0dr4qzp51x6y"; type = "gem"; }; - version = "17.0.2"; + version = "17.1.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2214,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"]; @@ -2278,10 +2332,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10gr7886pphgxg8ja1axba022l0b1c5mvqi1hfdhrvbh70f1vwim"; + sha256 = "0063h3aksh4jp5s7mrir5r2dr94643x736cgxvf1zz75nx0nkyq4"; type = "gem"; }; - version = "0.36.0"; + version = "0.36.1"; }; gitlab-license = { groups = ["default"]; @@ -2370,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"]; @@ -2444,10 +2498,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wsizq4hxcwkd8si14q7hb8rxh9hygpm3s7s0f8cyz2b62ycdcnh"; + sha256 = "0ljg28wf9vmi6bc639fcf19abx5i4a3h04bjvdwr2ih1pbr3hgf1"; type = "gem"; }; - version = "1.28.0"; + version = "1.31.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2838,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"]; @@ -2855,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"]; @@ -2892,10 +2946,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0df94lkqsis1kqgjch12mkm8fh55d6s1lqp2fvjj6xr310v323q2"; + sha256 = "1w8ahq2sry3hw2p7lmq4sd9ybkky4qr1dn634h6nchb5z0sphdlw"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.5"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2903,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"]; @@ -3201,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"]; @@ -3258,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 = []; @@ -3346,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"]; @@ -3529,10 +3593,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rbw6vr1chabkd0p3sqxcpva77vxgk3a1pzrv7h4m73jx4bixdbq"; + sha256 = "0wri6j02jkq75qgd4mpdmi2444lzcvyf63nvkfz9p31rvsj44v5n"; type = "gem"; }; - version = "1.6.14"; + version = "1.6.18"; }; letter_opener = { dependencies = ["launchy"]; @@ -3540,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"]; @@ -3551,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"]; @@ -3583,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"]; @@ -3630,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"]; @@ -3658,10 +3732,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffwg0lnvzfaxp9z7gynll1d4hlxm4ma2c05qcwqrznj7d7jkfnn"; + sha256 = "02hniq2gjckb0s70w2p90aymrf4x8lpjl0mq1arhl5fr2gmyzkdb"; type = "gem"; }; - version = "2.3.1"; + version = "2.3.2"; }; lru_redux = { groups = ["default"]; @@ -4187,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"]; @@ -4851,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"]; @@ -4935,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"]; @@ -5105,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"]; @@ -5138,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"]; @@ -5203,10 +5277,10 @@ 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"]; @@ -5325,6 +5399,17 @@ src: }; version = "0.9.94"; }; + rbs = { + dependencies = ["logger"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bnb361ca6gizncs8qybfrm1m9pin2siw548pizfd5l711mrzn4f"; + type = "gem"; + }; + version = "3.5.1"; + }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; groups = ["default"]; @@ -5606,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"]; @@ -5874,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 = "0730631afd1iadx51izm2adygwqd7aii95gdmy405d847x35bmf3"; + sha256 = "04z280c4mimfwpfgcw2j6b13g1vni0cnrfgwjs9bgkzm95m1vsj9"; type = "gem"; }; - version = "0.16.7"; + version = "0.17.4"; }; ruby-lsp-rails = { - dependencies = ["ruby-lsp" "sorbet-runtime"]; + dependencies = ["ruby-lsp"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdr6ir97af633lg0dkdasjflfmrlf50ad4x4jq7a712x4p1fxag"; + sha256 = "1w4vvhy8nyffj7bp17842kg6szhfz27w8pni0a7haam78hb86b1r"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5901,10 +5986,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11nc5ysf3rq47v7h9v17ivmca62bj7lm6x80fy5fpj45vxh7pz1l"; + sha256 = "1r8i93fq4ijnxbh9pfh5df0d0pl8xr23s7whvwqjyk6w4xg7gzil"; type = "gem"; }; - version = "0.1.11"; + version = "0.1.12"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -6052,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"]; @@ -6101,10 +6197,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9q502kp1az64lk0psblgdi50s5mr8x8g8k19avivkna0v5z6fs"; + sha256 = "0ndbdsac42sl6ldh6jji7k0agc85v6d28wfd3jb3awyl7hsgs9cn"; type = "gem"; }; - version = "3.0.1"; + version = "3.4.0"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6175,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"; }; @@ -6295,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"]; @@ -6401,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"]; @@ -6477,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"]; 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/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..9909d9829cbdd 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -19,16 +19,16 @@ 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 ]; 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..2a7cb13d2aa47 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -71,7 +71,7 @@ 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; }; 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/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/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..b074d0b086312 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v"; }; - cargoSha256 = "1j0vl3h6f65ldg80bgryh1mz423lcrcdkn8rmajya1850pfxk3w3"; + cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index 2cdf24160c518..6d1fc0926e526 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -19,20 +19,21 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.18.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-5KKF85RNCPPaXMxBb7m2XC3EaEo+UcEhBdfMEzNPsAg="; + hash = "sha256-1lONtpataRi0yE6LpN6oNnC3OAW918v8GFCUwinYJWI="; }; - cargoHash = "sha256-MiJuen3Lo7nPaAK30cENw3ACAdoYbHDoiGS05dk5m6U="; + cargoHash = "sha256-dRbOTxlFXfmeHUKH2UeN84OwlQ1urCND/Nfk9vSeLwA="; 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 + LIBGIT2_NO_VENDOR = "1"; # disable vendored libgit2 LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 nativeBuildInputs = [ @@ -52,7 +53,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/jj util mangen > ./jj.1 installManPage ./jj.1 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..af340bd22eaf0 100644 --- a/pkgs/applications/version-management/legit-web/default.nix +++ b/pkgs/applications/version-management/legit-web/default.nix @@ -5,16 +5,16 @@ 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 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/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 25c2df1ad71be..f60813a7eea64 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"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc="; + hash = "sha256-COTQ5dqK8RMrUea8M1AYCtV63Nk18Je20LwRmiwsChA="; }; format = "other"; @@ -37,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs="; + hash = "sha256-mP82UtASD0Fh8ilDDCB6ubY7/MGPoRP6hg6/xRwzwAw="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -45,7 +43,7 @@ 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 @@ -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..06e4624c8ee09 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,14 +31,14 @@ 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 ]; @@ -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/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 1004661499be2..2824ed82cfa22 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 { }; + 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/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 53df3af4a79d4..8887d5126fde0 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -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/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..f1536e8c54b2e 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -3,7 +3,6 @@ , python3Packages , fetchFromGitHub , fetchurl -, sd , cargo , curl , pkg-config @@ -48,7 +47,7 @@ let 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,11 +78,11 @@ 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 + + substituteInPlace build-tar.py \ + --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' - # 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 \ --output isl-dist.tar.xz \ --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' @@ -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 = '' 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/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/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index aba560a81d815..c572c2652f23d 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.9"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ="; + hash = "sha256-b8uzekKnNAJGeDYI2puHUaxY6K0s5tWxAWGpufJi/jk="; }; - cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk="; + cargoHash = "sha256-0bbOAo48xRiCyivO3fuThXAIEFgFbxh6ZtFOPikZi88="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index df5e36228290f..43a14907633cd 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -116,7 +116,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/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix index 5d5c8336987b8..98846c445dbf5 100644 --- a/pkgs/applications/version-management/ungit/default.nix +++ b/pkgs/applications/version-management/ungit/default.nix @@ -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/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/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/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 index 399287c93f7ff..3391210462c30 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # during Linking C executable ccextractor broken = stdenv.isAarch64; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "ccextractor"; }; } diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 12a66c90e8d54..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 diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index be18304386cbd..574de6f427b1f 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 @@ -38,7 +38,7 @@ let nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) - addOpenGLRunpath + addDriverRunpath copyDesktopItems unzip ]; @@ -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 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/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 index a3b40daacf79a..9a5e4f64d497c 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; + hash = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 1f21fabb78f96..ffe9beea5cd8e 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,19 +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 { - inherit pname version src; - }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; dontUnpack = true; dontConfigure = true; @@ -42,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..311e585b2d47a 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -1,6 +1,6 @@ { lib , callPackage -, python3 +, python311 , fetchFromGitHub , fetchurl , fetchpatch2 @@ -23,7 +23,8 @@ let inherit version src; }; - python = python3.override { + python = python311.override { + self = python; packageOverrides = self: super: { pydantic = super.pydantic_1; @@ -71,6 +72,14 @@ python.pkgs.buildPythonApplication rec { url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch"; hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU="; }) + (fetchpatch2 { + # https://github.com/blakeblackshear/frigate/pull/10097 + name = "frigate-secrets-permissionerror.patch"; + url = "https://github.com/blakeblackshear/frigate/commit/a1424bad6c0163e790129ade7a9784514d0bf89d.patch"; + hash = "sha256-/kIy4aW9o5AKHJQfCDVY46si+DKaUb+CsZsCGIbXvUQ="; + }) + # https://github.com/blakeblackshear/frigate/pull/12324 + ./mpl-3.9.0.patch ]; postPatch = '' diff --git a/pkgs/applications/video/frigate/mpl-3.9.0.patch b/pkgs/applications/video/frigate/mpl-3.9.0.patch new file mode 100644 index 0000000000000..84fe7867438d7 --- /dev/null +++ b/pkgs/applications/video/frigate/mpl-3.9.0.patch @@ -0,0 +1,42 @@ +From fba8cff13186bd80ceaa06806392957598139deb Mon Sep 17 00:00:00 2001 +From: Martin Weinelt <hexa@darmstadt.ccc.de> +Date: Sun, 7 Jul 2024 14:23:29 +0200 +Subject: [PATCH] Fix colormap usage with matplotlib 3.9.0 + +The mpl.cm toplevel registration has been removed. + +https://matplotlib.org/stable/api/prev_api_changes/api_changes_3.9.0.html#top-level-cmap-registration-and-access-functions-in-mpl-cm +--- + frigate/config.py | 2 +- + frigate/detectors/detector_config.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/frigate/config.py b/frigate/config.py +index 2e8b2570..af4f3263 100644 +--- a/frigate/config.py ++++ b/frigate/config.py +@@ -807,7 +807,7 @@ class CameraConfig(FrigateBaseModel): + def __init__(self, **config): + # Set zone colors + if "zones" in config: +- colors = plt.cm.get_cmap("tab10", len(config["zones"])) ++ colors = plt.colormaps["tab10"].resampled(len(config["zones"])) + config["zones"] = { + name: {**z, "color": tuple(round(255 * c) for c in colors(idx)[:3])} + for idx, (name, z) in enumerate(config["zones"].items()) +diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py +index 7fc958a3..b65631eb 100644 +--- a/frigate/detectors/detector_config.py ++++ b/frigate/detectors/detector_config.py +@@ -125,7 +125,7 @@ class ModelConfig(BaseModel): + + def create_colormap(self, enabled_labels: set[str]) -> None: + """Get a list of colors for enabled labels.""" +- cmap = plt.cm.get_cmap("tab10", len(enabled_labels)) ++ cmap = plt.colormaps["tab10"].resampled(len(enabled_labels)) + + for key, val in enumerate(enabled_labels): + self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3]) +-- +2.45.1 + diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c09b2c8170d4f..9e4eda8a0790a 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; }; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 436f31ac5a01d..3d6b281ef07b3 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { mainProgram = "gnome-mplayer"; homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.linux; }; } 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/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 7b8113e906e49..57da5147407eb 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.isDarwin [ + cctools + ]; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + ] ++ lib.optionals stdenv.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..89fda1154232c 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -2,6 +2,8 @@ , lib , fetchurl , makeWrapper +, meson +, ninja , pkg-config , libXcomposite , libpulseaudio @@ -10,24 +12,30 @@ , 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,20 +45,29 @@ 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 ''; 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/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index f9761bd85bb56..4a45138aa5554 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -90,14 +90,14 @@ }: let - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; # uses version commit for logic in version.txt - rev = "5edf59c1da54fe1c9a487d09e8f52561fe49cb2a"; - hash = "sha256-gr2UhqPY5mZOP8KBvk9yydl4AkTlqE83hYAcLwSv1Is="; + rev = "e9ff2bdf1ac670eb9c6d6170e27c999c05535127"; + hash = "sha256-grbT+oRIyLnyJowhdqw7qGRg11HzWGIU9yTwUQhCWtg="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these @@ -105,10 +105,10 @@ let # 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-version = "7.0.1"; ffmpeg-hb = (ffmpeg_7-full.override { version = ffmpeg-version; - hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA="; }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" @@ -133,8 +133,7 @@ let "${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" + "${src}/contrib/ffmpeg/A19-fix-qsv-on-gcc-14.patch" ]; }); diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 67df0dd420b00..00c2467624b80 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "hyperion-project"; repo = pname; rev = version; - sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + hash = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet 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-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/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 93217122d53bf..024f0f7d9fdcc 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -1,28 +1,35 @@ -{ 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.4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-Uyo8GClJU2/gdk4PeFNnoyvxOhooaxeXN3Wc5YGuCiM="; + sha256 = "sha256-N5ZNGeLf3P4p3RQimSaZteddKjqXE274mWpo7W9xqPs="; }; - 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 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/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..d3fdd0d054b23 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 @@ -97,6 +97,10 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; }; + patches = [ + ./no-python-lib.patch + ]; + # make derivations declared in the let binding available here, so # they can be overridden inherit libdvdcss libdvdnav libdvdread groovy @@ -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 @@ -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..b6aa8009dcd0a 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 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/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 8aaa0cf1448a3..79b16f06c6f1a 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 = "86.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; + hash = "sha256-h9rVs4A7JihnCj15XUus9xMvShKWyYhJN/90v/fl0PE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index 05c6799e4213b..e3f61cdd82018 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -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/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9bb23b548e3fb..c9219fdf63596 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 = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 97d1baf9c3e3f..47e5604eea5df 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4 +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_6 , aalibSupport ? true, aalib , fontconfigSupport ? true, fontconfig, freefont_ttf , fribidiSupport ? true, fribidi @@ -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 = '' @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; - [ freetype ffmpeg_4 ] + [ freetype ffmpeg_6 ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0f9cec9c409bd..5b255be9a1a58 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, @@ -203,7 +203,7 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath docutils # for rst2man meson ninja @@ -329,9 +329,9 @@ stdenv'.mkDerivation (finalAttrs: { ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. + # See the explanation in addDriverRunpath. postFixup = lib.optionalString stdenv.isLinux '' - addOpenGLRunpath $out/bin/mpv + addDriverRunpath $out/bin/mpv patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; @@ -377,7 +377,6 @@ stdenv'.mkDerivation (finalAttrs: { fpletz globin ma27 - tadeokondrak ]; platforms = lib.platforms.unix; }; 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..7795d1e7b9927 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-07-02"; src = fetchFromGitHub { owner = "po5"; repo = "memo"; - rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; - hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + rev = "43ad5bc37d4ac63a00dd2a8f15b9028789467da7"; + hash = "sha256-nHJ1x5R4Rw2YjB3Li3ZFbI3ZdLSqddJFzJlni4NjpH0="; }; 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-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 00e44d1f94474..a87ede7551635 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-07-28"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80"; - hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE="; + rev = "54ed4421f9db5df22524d37e565fe4bb2d12117e"; + hash = "sha256-RAIyPgqDjKkKcBAzIehpqxCNkWt0Gyxvfo8ycXkjAe0="; }; 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/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/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index 82f912677f14c..4436dca265d13 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-07-18"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "4fd40d66c95905ed828ca77b7120732014b93ac5"; - hash = "sha256-Q40a7BBY4c7I5g9HkeV6Twv/PDPBDKTlnxkILw99pxU="; + rev = "fe731767ca481678b4a166fbce6b30d3eaf8a6ce"; + hash = "sha256-Z63kccjl8jd6C0dvpK7SQnPpmDCgH3/Kzm1oRXJ0NqI="; }; patchPhase = diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 533ede74f8744..b68f2d50c5c49 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 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/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 82b557d449e17..0adac748460e1 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 @@ -39,7 +41,6 @@ , withFdk ? true , pipewire , libdrm -, libajantv2 , librist , libva , srt @@ -48,6 +49,8 @@ , nlohmann_json , websocketpp , asio +, decklinkSupport ? false +, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -60,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.1.2"; + version = "30.2.2"; src = fetchFromGitHub { owner = "obsproject"; - repo = finalAttrs.pname; + repo = "obs-studio"; rev = finalAttrs.version; - sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; + hash = "sha256-yMtLN/86+3wuNR+gGhsaxN4oGIC21bAcjbQfyTuXIYc="; fetchSubmodules = true; }; @@ -85,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath cmake pkg-config wrapGAppsHook3 @@ -111,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { libvlc mbedtls pciutils - libajantv2 librist libva srt @@ -122,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libdatachannel libvpl qrcodegencpp + uthash + nv-codec-headers-12 ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib @@ -153,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 [ @@ -165,6 +170,8 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL + ] ++ optionals decklinkSupport [ + blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail @@ -177,8 +184,8 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = lib.optionalString stdenv.isLinux '' - addOpenGLRunpath $out/lib/lib*.so - addOpenGLRunpath $out/lib/obs-plugins/*.so + 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/ 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..4415cd416e56e 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 @@ -68,6 +68,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..9a2069a27133a 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,7 +47,7 @@ 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; 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-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-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-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-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 5f47c666078c4..42dc432da095c 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.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; + sha256 = "sha256-JF/ZI0bJjHMoI4hpGPuMGDHMrd7tw0Kvwm/VhACLUfo="; }; 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..b66d3d01b234a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ 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 [ 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/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 514da9c50d750..ea4c7a3f711d7 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -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 = [ diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 4a8208d8bbb6e..406b391f2a258 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -47,7 +47,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { pyqtwebengine pyzmq requests - sip4 + sip ]; strictDeps = true; diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 854e4c6ba4bc3..c1cef4aa9cbde 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 @@ -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..e278d4a158c81 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 = [ ]; 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..52463c4689313 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; @@ -80,4 +81,3 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ pmiddend ]; }; } - 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/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index a720e672c783d..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; [ ]; + 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 index 61c6684a2f823..0f6ec1ebe7182 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://shotcut.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ goibhniu woffs peti ]; + maintainers = with maintainers; [ woffs peti ]; platforms = platforms.unix; mainProgram = "shotcut"; }; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 8e30dc3e6358c..4e78ef877492d 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -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 65b8406e8ee36..209023bb14cef 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.8.1"; + version = "6.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TEN++sKCtN8CZRnyBp4niRFlb+LPSNcyMCu9Rm+GOZ0="; + hash = "sha256-4/UaVnwIcDCS+R0El6P8Ku/jJ+/Ncl0D5m89zRHtm2g="; }; patches = [ diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0aa5ab26e653c..1cef55fa9ecd6 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -6,7 +6,6 @@ , mpv , nodejs , qmake -, qtwebchannel , qtwebengine , wrapQtAppsHook }: @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; + hash = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; }; server = fetchurl { diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index bc0d6bd3a6cb4..713a0ad2753ea 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 ]; diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index b192edbffa0e9..aa00f5e8dce03 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index 2124813f417fd..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; [ ]; + maintainers = [ ]; mainProgram = "timelens"; }; } 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..afce9a79d0abb 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.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-PvSo5qiDMVrL6ylts5leR/3YAqIpIZcmnAqnGopPG94="; + sha256 = "sha256-gn1Z3pw8f0Tpo8Ot0hP9+p/KbK/EGOInE34BCH3aVp0="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index f4e2c8ee714fd..830c09bfa6d6c 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -25,7 +25,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 = [ ]; platforms = platforms.linux; mainProgram = "wf-recorder"; }; 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/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/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index c208ec8f92d9c..27df7ab819253 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; + buildInputs = lib.optional stdenv.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..0d37d9c9bce6e 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-7kaZ55Uhvx8V75IgURD03fLoAd/O/+2h/7tv9XiqnX4="; + hash = "sha256-gXLKqSmlj3TJNmqYuByJ2CcUCV3xD239YeuWzrN97lo="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -35,7 +35,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-FPcz109zQBHaS/bIl78rVeiEluR1PhrJhgs21Ex6qEg="; + vendorHash = "sha256-OXK6ZHKghKxgETjY3mg1R2yp8pPpy5yV8M4K+Hh9Fjw="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index ed68dbc376e93..2bfbf5e4a2555 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.19"; + version = "1.7.20"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-+tYv80y//C67F0QUjCkZYcahiHO4rZtlcr+33foN/M8="; + hash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index b52c91e4e1eda..5f7103886ccca 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.3"; + version = "1.30.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-Cv76S2Ylsjzjc6rjCcRJyFjrIrm76I5pqDa1FI+Oq9s="; + hash = "sha256-PfG5RlUmMGMduTApdlHoI+4kdRprvWXeXZDkd6brVkM="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index d2fda361660e7..cc6b7f269c693 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 = "126.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; - hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; + rev = "5533201f3ff3230d121e06100557d369c055e6dc"; + hash = "sha256-Ufi8dIhNgXvD53PWLG2uj7CD37UZIegrqAQz3wTKTvE="; 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-E2lyBgptQs+/5JS2WJc4ietguXdK16DFEVzqylmX+Pk="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 549022d9908c2..66ed0aa6b2839 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.3"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ="; + hash = "sha256-+DQEXJcW0nKBvw+pWZnFJfO/7R9IjbhAl9WZvorO9Io="; }; 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 3b5f5669d7f7f..2230e31231e74 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.15.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA="; + hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 04868b951b7bd..20c390d58dc98 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.28.1"; + version = "2.29.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-AfWUCgW+aZkedd94uPpfBKKZC1Xvq9wonuCSXGHm774="; + hash = "sha256-6GZtKfPBE9Wl6ccwU1OY+9rq+IZr2qpOB4Vlxidhisw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-MykoU0q2cCnY02a52kyg35L4tJ3KZTzA4usf194Wnbw="; + vendorHash = "sha256-CkXCAqHOlSc3jHqVUYovT8YDnlCZewpLv3sC0ADgwL0="; 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 a48eda041fefe..a8a4863d6bf3b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -21,6 +21,7 @@ rec { , withBtrfs ? stdenv.isLinux, btrfs-progs , withLvm ? stdenv.isLinux, lvm2 , withSeccomp ? stdenv.isLinux, libseccomp + , knownVulnerabilities ? [] }: let docker-runc = runc.overrideAttrs { @@ -267,6 +268,7 @@ rec { license = licenses.asl20; maintainers = with maintainers; [ offline vdemeester periklis teutat3s ]; mainProgram = "docker"; + inherit knownVulnerabilities; }; }); @@ -284,46 +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.0.3"; + version = "27.1.1"; cliRev = "v${version}"; - cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI="; + cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0="; mobyRev = "v${version}"; - mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU="; + mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g="; runcRev = "v1.1.13"; runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; - containerdRev = "v1.7.18"; - containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + containerdRev = "v1.7.20"; + containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index ea58577680776..ee2e1aa0a35f1 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.84.0"; + version = "1.85.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk="; + hash = "sha256-TrfFJ6N1DreO3NcznXBcNZziESAMxWa4FR+KzDjRDmM="; }; 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/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/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index a3eaea0cfd787..bfc8d2177ce99 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -47,15 +47,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; }; @@ -80,7 +80,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 +105,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..a72770d347635 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.26.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-niKz+F1RJtZrE8+BaJwy5bjGS3miJf5C9LttTnC+iuk="; + sha256 = "sha256-w6XOSTMrjUg7q/M3a21sD2U+swmdkIUNvglgTFbufh8="; }; - cargoHash = "sha256-fzG53DqZKgW6Gen+0ZO9lxgPXkxw7S6OdZWNNI+y9hU="; + cargoHash = "sha256-Kxz7Lw2LEC6YwycR5kj+vRIoT7Jqt2y9rLJq8ACM/0E="; # skip test due FHS dependency doCheck = false; 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..707053dc82b92 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -49,7 +49,7 @@ let 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 [ @@ -65,13 +65,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-3u4QOX7K0bMcbvwkXVoCpq7p5rKkvmOlOIRSUEbjFOY="; + hash = "sha256-Rb9rOetMVxf1GhEOzZmaUwRI4nkPdJnpkpjIyJcb6r8="; }; patches = [ 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..6f4241444b623 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU="; + hash = "sha256-qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] 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..2d6b7d3da0c50 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -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/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index 5b985bb80551e..6237db9cd6991 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.3"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-NseigaPmRKDsBk8v7RpYf+uoEGvQHVnqOMO49kP0mQ8="; + hash = "sha256-xQZCQa9z1aJ2tVtxMlwcNhlm0EV/nn8OnbfaVZRm4JI="; }; # Update by running diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index d9324d455c5c9..a1f3fb53e0430 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; + hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; - cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; + cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index d0f2f3a0127e1..19ffd92db8189 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.14.0"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M="; + hash = "sha256-3I4WSdWfPZd//pJiYXKcgpjx8qv4nSeMHHGJE1ja00o="; }; 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-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 244d1237152e5..9173e94740520 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -29,8 +29,8 @@ 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 = "20240617"; kvmPatchHash = "sha256-bOcM9xA1SXB1uTwljpw2vevVeSdHa3omCRon/8DoAUk="; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 089ab4856c0d0..c234c079b4c89 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "cab1abad478679fc34a0c5cb4a6d3566edc20e3c54cbed39c8e895d8cfad3ee2"; + let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; in assert (builtins.stringLength value) == 64; value; meta = { 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..4e0b8728f29b8 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,6 +1,5 @@ -{ 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; 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/0000-fix-ipxe-src.4.15.patch b/pkgs/applications/virtualization/xen/4.16/0000-xen-ipxe-src-4.16.patch index 08e9aa5ad2fb9..d96023d1946ae 100644 --- a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch +++ b/pkgs/applications/virtualization/xen/4.16/0000-xen-ipxe-src-4.16.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/4.16/default.nix b/pkgs/applications/virtualization/xen/4.16/default.nix new file mode 100644 index 0000000000000..33aba63846236 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.16/default.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten [ upstreamPatches.XSA_458 ]; +in + +callPackage (import ../generic.nix { + branch = "4.16"; + version = "4.16.6"; + latest = false; + pkg = { + xen = { + rev = "4b33780de790bd438dd7cbb6143b410d94f0f049"; + hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA="; + patches = [ ./0000-xen-ipxe-src-4.16.patch ] ++ upstreamPatchList; + }; + qemu = { + rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3"; + hash = "sha256-LwlPry04az9QQowaDG2la8PYlGOUMbZaQAsCHxj+pwM="; + patches = [ ]; + }; + seaBIOS = { + rev = "d239552ce7220e448ae81f41515138f7b9e3c4db"; + hash = "sha256-UKMceJhIprN4/4Xe4EG2EvKlanxVcEi5Qcrrk3Ogiik="; + patches = [ ]; + }; + ovmf = { + rev = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"; + hash = "sha256-Qq2RgktCkJZBsq6Ch+6tyRHhme4lfcN7d2oQfxwhQt8="; + patches = [ ]; + }; + ipxe = { + rev = "3c040ad387099483102708bb1839110bc788cefb"; + hash = "sha256-y2QdZEoGsGUQjrrvD8YRa8VoqcZSr4tjLM//I/MrsLI="; + patches = [ ]; + }; + }; +}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition) diff --git a/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch b/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch new file mode 100644 index 0000000000000..d96023d1946ae --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch @@ -0,0 +1,27 @@ +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 - ++$D/src/arch/i386/Makefile: $G Config ++ mkdir $D ++ cp -a $G/* $D + for i in $$(cat patches/series) ; do \ + patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \ + done 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..8afe1c8b3864f --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.17/default.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten [ + upstreamPatches.QUBES_REPRODUCIBLE_BUILDS + upstreamPatches.XSA_458 + ]; +in + +callPackage (import ../generic.nix { + branch = "4.17"; + version = "4.17.4"; + latest = false; + pkg = { + xen = { + rev = "d530627aaa9b6e03c7f911434bb342fca3d13300"; + hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo="; + patches = [ ./0000-xen-ipxe-src-4.17.patch ] ++ 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/0000-xen-ipxe-src-4.18.patch b/pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch new file mode 100644 index 0000000000000..d96023d1946ae --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.18/0000-xen-ipxe-src-4.18.patch @@ -0,0 +1,27 @@ +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 - ++$D/src/arch/i386/Makefile: $G Config ++ mkdir $D ++ cp -a $G/* $D + for i in $$(cat patches/series) ; do \ + patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \ + done 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..56a238c9e697d --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.18/default.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten [ + upstreamPatches.QUBES_REPRODUCIBLE_BUILDS + upstreamPatches.XSA_458 + ]; +in + +callPackage (import ../generic.nix { + branch = "4.18"; + version = "4.18.2"; + latest = false; + pkg = { + xen = { + rev = "d152a0424677d8b78e00ed1270a583c5dafff16f"; + hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY="; + patches = [ ./0000-xen-ipxe-src-4.18.patch ] ++ 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/0000-xen-ipxe-src-4.19.patch b/pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch new file mode 100644 index 0000000000000..d96023d1946ae --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.19/0000-xen-ipxe-src-4.19.patch @@ -0,0 +1,27 @@ +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 - ++$D/src/arch/i386/Makefile: $G Config ++ mkdir $D ++ cp -a $G/* $D + for i in $$(cat patches/series) ; do \ + patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \ + done 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..45387655bc077 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.19/default.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten [ upstreamPatches.QUBES_REPRODUCIBLE_BUILDS ]; +in + +callPackage (import ../generic.nix { + branch = "4.19"; + version = "4.19.0"; + latest = true; + pkg = { + xen = { + rev = "026c9fa29716b0ff0f8b7c687908e71ba29cf239"; + hash = "sha256-Q6x+2fZ4ITBz6sKICI0NHGx773Rc919cl+wzI89UY+Q="; + patches = [ ./0000-xen-ipxe-src-4.19.patch ] ++ 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..c059808dcecbf --- /dev/null +++ b/pkgs/applications/virtualization/xen/README.md @@ -0,0 +1,205 @@ +<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 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 Hypervisor](https://xenproject.org/). + +Some other notable packages that compose the Xen 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. + +## 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` 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 2> /dev/null | tail -c +2 | head -c -2)\033[0m\n\n$(nix eval .#"$xenToEvaluate".meta.longDescription 2> /dev/null | tail -c +2 | head -c -2)" + ``` + + Change the value of `xenToEvaluate` to evaluate all relevant Xen packages. +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.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 index 826cd8a3d9d84..b8672770e5bdd 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -1,265 +1,690 @@ -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; +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 + fig2dev, + imagemagick, + 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 = concatMapStringsSep ":" (x: "${x}/bin") [ - which perl - coreutils gawk gnused gnugrep diffutils util-linux multipath-tools - iproute2 inetutils iptables bridge-utils openvswitch nbd drbd + #TODO: fix paths instead. + scriptEnvPath = lib.strings.concatMapStringsSep ":" (x: "${x}/bin") [ + bridge-utils + coreutils + diffutils + gawk + gnugrep + gnused + inetutils + iproute2 + iptables + multipath-tools + nbd + openvswitch + perl + util-linux + which ]; - 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} + inherit (versionDefinition) branch; + inherit (versionDefinition) version; + inherit (versionDefinition) latest; + inherit (versionDefinition) pkg; + pname = "xen"; + + # Sources needed to build tools and firmwares. + prefetchedSources = + lib.attrsets.optionalAttrs withInternalQEMU { + qemu-xen = { + src = fetchgit { + url = "https://xenbits.xen.org/git-http/qemu-xen.git"; + fetchSubmodules = true; + inherit (pkg.qemu) rev; + inherit (pkg.qemu) hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; + postPatch = '' + substituteInPlace scripts/tracetool.py \ + --replace-fail "/usr/bin/env python" "${python311Packages.python}/bin/python" + ''; + }; } - ( __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 + // lib.attrsets.optionalAttrs withInternalSeaBIOS { + "firmware/seabios-dir-remote" = { + src = fetchgit { + url = "https://xenbits.xen.org/git-http/seabios.git"; + inherit (pkg.seaBIOS) rev; + inherit (pkg.seaBIOS) hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ + "patches" + ] pkg.seaBIOS) pkg.seaBIOS.patches; + }; + } + // lib.attrsets.optionalAttrs withInternalOVMF { + "firmware/ovmf-dir-remote" = { + src = fetchgit { + url = "https://xenbits.xen.org/git-http/ovmf.git"; + fetchSubmodules = true; + inherit (pkg.ovmf) rev; + inherit (pkg.ovmf) hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; + postPatch = '' + substituteInPlace \ + OvmfPkg/build.sh BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} \ + --replace-fail "/usr/bin/env bash" ${stdenv.shell} + ''; + }; + } + // lib.attrsets.optionalAttrs withInternalIPXE { + "firmware/etherboot/ipxe.git" = { + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + inherit (pkg.ipxe) rev; + inherit (pkg.ipxe) hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; + }; + }; + withPrefetchedSources = + sourcePkg: lib.strings.concatLines (lib.attrsets.mapAttrsToList sourcePkg prefetchedSources); + + # 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.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 + [ ]; + + withTools = + attr: file: + withPrefetchedSources ( + name: source: + lib.strings.optionalString (builtins.hasAttr attr source) '' + echo "processing ${name}" + __do() { + cd "tools/${name}" + ${file name source} + } + ( __do ) + '' + ); + + # 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 host/target mis-match + configureFlags = oldAttrs.configureFlags ++ [ "--enable-targets=x86_64-pep" ]; + doInstallCheck = false; # We get a spurious failure otherwise, due to a host/target mismatch. }); in -stdenv.mkDerivation (rec { - inherit (config) version; - - name = "xen-${version}"; +stdenv.mkDerivation (finalAttrs: { + inherit pname; + inherit 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 + 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. + ]; - # Python fixes - python3Packages.wrapPython + # Main Xen source. + src = fetchgit { + url = "https://xenbits.xen.org/git-http/xen.git"; + inherit (pkg.xen) rev; + inherit (pkg.xen) hash; + }; + + # Gets the patches from the pkg.xen.patches attribute from the versioned files. + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.xen) pkg.xen.patches; + + nativeBuildInputs = + [ + autoPatchelfHook + bison + cmake + fig2dev + imagemagick # Causes build failures in Hydra related to fig generation if not included. + 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 + systemdMinimal + + # Python Fixes + python311Packages.wrapPython + ] + ++ lib.lists.optionals withInternalQEMU [ + glib + pixman + ] + ++ lib.lists.optional withInternalOVMF nasm + ++ lib.lists.optional withFlask checkpolicy; + + configureFlags = + [ "--enable-systemd" ] + ++ 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"; + + makeFlags = + [ + "PREFIX=$(out)" + "CONFIG_DIR=/etc" + "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" + "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=${efiBinutils}/bin/ld" # 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 + # TODO: Enable the Stubdomains target. This requires another pre-fetched source: mini-os. Currently, Xen appears to build a limited version of stubdomains which does not include mini-os. + # "stubdom" + ]; - # Documentation - python3Packages.markdown fig2dev ghostscript texinfo pandoc + enableParallelBuilding = true; - # Others - ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) - ++ (config.buildInputs or []); + 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" + ] + ); - prePatch = '' - ### Generic fixes + 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 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) '' + # 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 + '' + + # The following expression moves the sources we fetched in the + # versioned Nix expressions to their correct locations inside + # the Xen source tree. + + '' + ${withPrefetchedSources ( + name: source: '' + echo "Copying pre-fetched source: ${source.src} -> tools/${name}" + cp --recursive ${source.src} tools/${name} + chmod --recursive +w tools/${name} + '' + )} + ''; + + 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 /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" ]; + --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" + '' + + # The following expression applies the patches defined on each + # prefetchedSources attribute. + + '' + ${withTools "patches" ( + name: source: '' + ${lib.strings.concatMapStringsSep "\n" (patch: '' + echo "Patching with ${patch}" + patch --strip 1 < ${patch} + '') source.patches} + '' + )} + + ${withTools "postPatch" (name: source: source.postPatch)} + + ${pkg.xen.postPatch or ""} + ''; + + preBuild = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "preBuild" ] pkg.xen) pkg.xen.preBuild; 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\" + ${withTools "buildPhase" (name: source: source.buildPhase)} - 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 + ${pkg.xen.postBuild or ""} ''; - enableParallelBuilding = true; + 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 + '' + + + '' + ${withTools "installPhase" (name: source: source.installPhase)} + + ${pkg.xen.installPhase or ""} + ''; + + 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" + ]; + }; + }; + }; - # 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" + inherit branch; + # Short description for Xen. + description = + "Xen 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.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`: Xen'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`: Xen's mirror of [QEMU](https://www.qemu.org/)." + + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." + + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." + + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen'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 (${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 + ]; + maintainers = [ lib.maintainers.sigmasquadron ]; + mainProgram = "xl"; + # Evaluates to x86_64-linux. + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "4.16") [ + "Xen ${version} is no longer supported by the Xen Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html" ]; - } // (config.meta or {}); -} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) + }; +}) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index c55a719995c0b..96bd42e052013 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,58 +1,68 @@ -{ 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 Xen"; 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 Xen. Uses forks of QEMU, SeaBIOS, OVMF and iPXE provided + by the Xen Project. This provides the vanilla Xen experince, 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 Xen that reuses nixpkgs packages as much as possible. + Instead of using the Xen 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; + 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; + }; - 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_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; + }; + + xen_4_16 = callPackage ./4.16/default.nix { inherit (standard) meta; }; + xen_4_16-slim = xen_4_16.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 = xen_4_19; + xen-slim = xen_4_19-slim; } diff --git a/pkgs/applications/virtualization/xen/patches.nix b/pkgs/applications/virtualization/xen/patches.nix new file mode 100644 index 0000000000000..7236fcf28e0f6 --- /dev/null +++ b/pkgs/applications/virtualization/xen/patches.nix @@ -0,0 +1,117 @@ +# 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 #458: (4.16 - 4.19-rc3) + "XSA_458" = xsaPatch { + id = "458"; + title = "Double unlock in x86 guest IRQ handling"; + description = '' + An optional feature of PCI MSI called "Multiple Message" allows a device + to use multiple consecutive interrupt vectors. Unlike for MSI-X, the + setting up of these consecutive vectors needs to happen all in one go. + In this handling an error path could be taken in different situations, + with or without a particular lock held. This error path wrongly releases + the lock even when it is not currently held. + ''; + cve = [ "CVE-2024-31143" ]; + hash = "sha256-yHI9Sp/7Ed40iIYQ/HOOIULlfzAzL0c0MGqdF+GR+AQ="; + }; +} diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh new file mode 100755 index 0000000000000..0b0c7516fa835 --- /dev/null +++ b/pkgs/applications/virtualization/xen/update.sh @@ -0,0 +1,194 @@ +#!/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 -e + +# Set a temporary $HOME in /tmp for GPG. +HOME=/tmp/xenUpdateScript + +# 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 --quiet --import /tmp/xenUpdateScript/xen.asc +fingerprint="$(gpg --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.xen.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 " knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version " "$xenPath"/generic.nix | sed s/' knownVulnerabilities = lib.lists.optionals (lib.strings.versionOlder version "'//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)) + +# 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 --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 "\nDetermining source versions from Xen Makefiles..." + qemuVersion="$(grep -ie "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" + seaBIOSVersion="$(grep -ie "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" + ovmfVersion="$(grep -ie "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" + ipxeVersion="$(grep -ie "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + + # 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.xen.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.xen.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.xen.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.xen.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_458") + 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[@]}}) + spaceSeparatedPatchList=${defaultPatchList[*]} + upstreamPatches="upstreamPatches.${spaceSeparatedPatchList// / upstreamPatches.}" + + # Write and format default.nix file. + echo -e "\nWriting updated \e[1;34mversionDefinition\e[0m..." + cat >"$branch"/default.nix <<EOF +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten [ + $upstreamPatches + ]; +in + +callPackage (import ../generic.nix { + 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 "Formatting..." + nixfmt "$branch"/default.nix + + 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/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix index d63fa87238e45..7b7cf4911c90c 100644 --- a/pkgs/applications/virtualization/youki/default.nix +++ b/pkgs/applications/virtualization/youki/default.nix @@ -6,6 +6,7 @@ , dbus , libseccomp , systemd +, stdenv }: rustPlatform.buildRustPackage rec { @@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus libseccomp systemd ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd youki \ --bash <($out/bin/youki completion -s bash) \ --fish <($out/bin/youki completion -s fish) \ @@ -44,7 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://containers.github.io/youki/"; changelog = "https://github.com/containers/youki/releases/tag/v${version}"; license = licenses.asl20; - maintainers = []; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "youki"; }; 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/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/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index f994b19175209..2970e724b3fda 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -26,6 +26,12 @@ 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; } (import ./hyprland-plugins.nix) ]; in 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..be074e0c5e83e --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix @@ -0,0 +1,32 @@ +{ + 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; + }; +} 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..95d7b2842cf9f --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -0,0 +1,37 @@ +{ + lib, + mkHyprlandPlugin, + fetchFromGitHub, + hyprland, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hypr-dynamic-cursors"; + version = "0-unstable-2024-07-06"; + + src = fetchFromGitHub { + owner = "VirtCode"; + repo = "hypr-dynamic-cursors"; + rev = "85423b074e112f28e84f6276d31d1548906a625e"; + hash = "sha256-lCAZ/7xtOE6P7uPIX2uQgC0nDOBZefWYO3O3izRx19E="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv out/dynamic-cursors.so $out/lib/libhypr-dynamic-cursors.so + + runHook postInstall + ''; + + 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..f493ec6e526d4 --- /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.7.0"; + + src = fetchFromGitHub { + owner = "horriblename"; + repo = "hyprgrass"; + rev = "v${version}"; + hash = "sha256-DfM2BqnFW48NlHkBfC7ErHgK7WHlOgiiE+aFetN/yJ4="; + }; + + 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/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix new file mode 100644 index 0000000000000..f94da804d370a --- /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-07-04"; + + src = fetchFromGitHub { + owner = "dawsers"; + repo = "hyprscroller"; + rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184"; + hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI="; + }; + + 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..66d6fcd7506ef --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -0,0 +1,44 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + hyprland, + mkHyprlandPlugin, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprspace"; + version = "0-unstable-2024-06-17"; + + src = fetchFromGitHub { + owner = "KZDKM"; + repo = "hyprspace"; + rev = "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7"; + hash = "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8="; + }; + + # Fix build for Hyprland v0.41.2+ + patches = fetchpatch { + url = "https://github.com/KZDKM/Hyprspace/commit/edad6cf735097b7cb4406d3fc8daddd09dfa458a.patch"; + hash = "sha256-EVabjPymGAMPtC3Uf6lMJOInvccJhu4t09NXhXhq4RY="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv Hyprspace.so $out/lib/libhyprspace.so + + runHook postInstall + ''; + + 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-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..17bf63a727537 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hyprwm"; - repo = finalAttrs.pname; + repo = "hyprpaper"; rev = "v${finalAttrs.version}"; hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA="; }; 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..322962123547c 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,36 +1,39 @@ -{ 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, + fetchpatch, + cmake, + pkg-config, + wayland-scanner, + makeWrapper, + wrapQtAppsHook, + nix-update-script, + hyprland-protocols, + hyprlang, + libdrm, + mesa, + pipewire, + qtbase, + qttools, + qtwayland, + sdbus-cpp, + systemd, + wayland, + wayland-protocols, + hyprland, + hyprpicker, + slurp, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; - rev = "v${self.version}"; - hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI="; }; nativeBuildInputs = [ @@ -61,18 +64,33 @@ 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") + hyprpicker + ] + } ''; - 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/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16dd2e6485e77..6438eee19525d 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { 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 }: @@ -29,27 +29,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.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 = '' 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/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/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..88ea73105a568 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.4.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D+dG0/MSC6LzGZBMNofU8WKVYvn52kNWunXExQPoOu8="; + sha256 = "sha256-iZTdhWHlorTAJTd3p2ZJbD5LRYkUmDAFjSEIR5E0JDI="; }; - cargoHash = "sha256-WEEAFr5lemyOfeIKC9Pvr9sYMz8rLO6k1BFgbxXJ0Pk="; + cargoHash = "sha256-SEL7hpHcW+p49vFRedC1hDRZ/Vq9zMzMAACyyBXHwZM="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index 0ac02b0957fa9..5a30b46e907e0 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -1,11 +1,9 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , qtquickcontrols2 , cmake , extra-cmake-modules -, kio , krunner , prison , knotifyconfig diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 6bbbf6100949f..4547d1df83633 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-06-13"; + version = "0-unstable-2024-07-17"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "2e88df729fb4961fa81dc9848291fe73c5657c03"; - hash = "sha256-a5c48U+FaHns52/wQQxYQMSXjjqGzaMh1gs3HTOM7Ys="; + rev = "810dea99773f96a4ef4471bf00c65089956ff97a"; + hash = "sha256-hkHipu1ERiM8UH18NuyxILyxxXvyVTOSLBP/7Z64ZTg="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 26211ca2f89c6..3a563f9e17238 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.38.0"; + version = "0.39.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="; + hash = "sha256-9vN4IqGoRHDJQYohycrrSj4ITJHHaSNgPjpEjRCCvUw="; }; nativeBuildInputs = [ 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/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/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/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..e9f8f245dfa7c 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - # raise neatvnc version bound to 0.8.0 + # raise neatvnc version bound to < 0.9.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']" + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '< 0.9.0']" ''; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index e68dcdcd0e812..edeeaf5fbf654 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "yabar"; }; } |