diff options
Diffstat (limited to 'pkgs/applications')
1060 files changed, 25053 insertions, 43983 deletions
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 08ef2d0830887..517db11c2865f 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 -, python3Packages , meson, ninja }: +{ lib, stdenv, fetchFromGitea, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +, python3Packages , meson, ninja, gitUpdater }: stdenv.mkDerivation rec { pname = "a2jmidid"; - version = "9"; + version = "12"; - src = fetchFromGitHub { - owner = "linuxaudio"; - repo = pname; - rev = version; - sha256 = "sha256-WNt74tSWV8bY4TnpLp86PsnrjkqWynJJt3Ra4gZl2fQ="; + src = fetchFromGitea { + domain = "gitea.ladish.org"; + owner = "LADI"; + repo = "a2jmidid"; + rev = "refs/tags/${version}"; + fetchSubmodules = true; + hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; nativeBuildInputs = [ pkg-config makeWrapper meson ninja ]; @@ -21,9 +23,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/a2j --replace "a2j_control" "$out/bin/a2j_control" ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; - license = licenses.gpl2; + homepage = "https://a2jmidid.ladish.org/"; + license = licenses.gpl2Only; maintainers = [ maintainers.goibhniu ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix index 2b5aea7e5843c..9504a5e9521bf 100644 --- a/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -6,18 +6,19 @@ , alsa-utils , alsa-lib , gtk4 +, openssl , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "alsa-scarlett-gui"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "geoffreybennett"; repo = pname; rev = version; - sha256 = "sha256-lIwDNyzuvolDhTVCslCtUfbsC/TxKtxQF97h0zYxp9k="; + sha256 = "sha256-+74JRQn2xwgPHZSrp5b+uny0+aLnsFvx/cOKIdj4J40="; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; sourceRoot = "${src.name}/src"; nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ]; - buildInputs = [ gtk4 alsa-lib ]; + buildInputs = [ gtk4 alsa-lib openssl ]; postInstall = '' wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} @@ -37,11 +38,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify3" ]; meta = with lib; { - description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3 Mixer Driver"; + description = "GUI for alsa controls presented by Focusrite Scarlett Gen 2/3/4 Mixer Driver"; mainProgram = "alsa-scarlett-gui"; homepage = "https://github.com/geoffreybennett/alsa-scarlett-gui"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ sebtm ]; + maintainers = with maintainers; [ mdorman ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 74af177d0e278..871b8767b1a15 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-YlRWCu6kQYdzast7Mf29p4FvpXJHQLG7vqqo/5SNQCQ="; + hash = "sha256-vJhCONoEC4Bdd1ZOLLobjNgLb/DT6auuMGk8L9lj6TU="; }; postPatch = '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 93296b3eff0b0..3ec595e3e8bbc 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.3"; + version = "5.1.6"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-1/iKezOD2HCym6JBXRa9rGpjolJjrxRZA4vwfgZyVng="; + sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 70d199d43b11e..33ad843db529d 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.10"; + version = "24.04"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-6Wt2sC7vdrz2Fkl08bNLfnGu+pAV7b5lZUmsx1wtJRE="; + hash = "sha256-vowDdHAXVZ+HSMoQsvJdzghsJzH+OrSpx6MxPRAgtJA="; }; prePatch = '' diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/applications/audio/castopod/default.nix index 9d9f83e2ecce4..13bb4afe8e2d1 100644 --- a/pkgs/applications/audio/castopod/default.nix +++ b/pkgs/applications/audio/castopod/default.nix @@ -3,15 +3,15 @@ , ffmpeg-headless , lib , nixosTests -, stateDirectory ? "/var/lib/castopod" +, dataDir ? "/var/lib/castopod" }: stdenv.mkDerivation { pname = "castopod"; - version = "1.6.4"; + version = "1.10.5"; src = fetchurl { - url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz"; - sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v"; + url = "https://code.castopod.org/adaures/castopod/uploads/66de724407be8f940af5eb1d633fbbc3/castopod-1.10.5.tar.gz"; + sha256 = "0ssdgqxqldg2f6ni54k5vlndnjjy9lah47q1crpz5nnkkjgvc96y"; }; dontBuild = true; @@ -20,13 +20,16 @@ stdenv.mkDerivation { postPatch = '' # not configurable at runtime unfortunately: substituteInPlace app/Config/Paths.php \ - --replace "__DIR__ . '/../../writable'" "'${stateDirectory}/writable'" + --replace "__DIR__ . '/../../writable'" "'${dataDir}/writable'" - # configuration file must be writable, place it to ${stateDirectory} + substituteInPlace modules/Admin/Controllers/DashboardController.php \ + --replace "disk_total_space('./')" "disk_total_space('${dataDir}')" + + # configuration file must be writable, place it to ${dataDir} substituteInPlace modules/Install/Controllers/InstallController.php \ - --replace "ROOTPATH" "'${stateDirectory}/'" + --replace "ROOTPATH" "'${dataDir}/'" substituteInPlace public/index.php spark \ - --replace "DotEnv(ROOTPATH)" "DotEnv('${stateDirectory}')" + --replace "DotEnv(ROOTPATH)" "DotEnv('${dataDir}')" # ffmpeg is required for Video Clips feature substituteInPlace modules/MediaClipper/VideoClipper.php \ diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 96f0ab0f706a6..258a9cd2065af 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl }: +{ appimageTools, lib, fetchurl, makeWrapper}: appimageTools.wrapType2 rec { pname = "cider"; @@ -14,18 +14,22 @@ appimageTools.wrapType2 rec { in '' mv $out/bin/${pname}-${version} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-warn 'Exec=AppRun' 'Exec=${pname}' cp -r ${contents}/usr/share/icons $out/share ''; meta = with lib; { description = "A new look into listening and enjoying Apple Music in style and performance."; homepage = "https://github.com/ciderapp/Cider"; - license = licenses.agpl3; + license = licenses.agpl3Only; + mainProgram = "cider"; maintainers = [ maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; - mainProgram = "cider"; }; } diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2ebeb55584895..7448e562ffa60 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config +{ config, lib, stdenv, fetchFromGitHub, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox , alsaSupport ? stdenv.isLinux, alsa-lib ? null @@ -92,31 +92,15 @@ in stdenv.mkDerivation rec { pname = "cmus"; - version = "2.10.0"; + version = "2.10.0-unstable-2023-11-05"; src = fetchFromGitHub { owner = "cmus"; repo = "cmus"; - rev = "v${version}"; - sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM="; + rev = "23afab39902d3d97c47697196b07581305337529"; + sha256 = "sha256-pxDIYbeJMoaAuErCghWJpDSh1WbYbhgJ7+ca5WLCrOs="; }; - patches = [ - ./option-debugging.patch - # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/ - (fetchpatch { - name = "ffmpeg-6-compat.patch"; - url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; - hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; - }) - # function detection breaks with clang 16 - (fetchpatch { - name = "clang-16-function-detection.patch"; - url = "https://github.com/cmus/cmus/commit/4123b54bad3d8874205aad7f1885191c8e93343c.patch"; - hash = "sha256-YKqroibgMZFxWQnbmLIHSHR5sMJduyEv6swnKZQ33Fg="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index e07217567d340..65cad453f6b73 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -1,52 +1,41 @@ -{ lib, fetchFromGitHub -, ninja +{ lib +, python3Packages +, fetchFromGitHub , meson +, ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils -, gtk3 -, gst_all_1 , gobject-introspection , libadwaita -, libdazzle -, python3Packages -, cairo -, gettext -, gnome -, pantheon +, gst_all_1 }: python3Packages.buildPythonApplication rec { - - format = "other"; # no setup.py - pname = "cozy"; version = "1.3.0"; + pyproject = false; # built with meson src = fetchFromGitHub { owner = "geigi"; - repo = pname; + repo = "cozy"; rev = version; hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; nativeBuildInputs = [ - meson ninja pkg-config - wrapGAppsHook + meson + ninja + pkg-config + wrapGAppsHook4 appstream-glib desktop-file-utils gobject-introspection ]; buildInputs = [ - gtk3 - cairo - gettext - gnome.adwaita-icon-theme libadwaita - libdazzle - pantheon.granite ] ++ (with gst_all_1; [ gstreamer gst-plugins-good @@ -56,32 +45,30 @@ python3Packages.buildPythonApplication rec { ]); propagatedBuildInputs = with python3Packages; [ - apsw - cairo - dbus-python distro - gst-python - magic mutagen - packaging peewee pygobject3 pytz requests ]; - postPatch = '' - patchShebangs meson/*.py + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - postInstall = '' + postFixup = '' ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy ''; meta = with lib; { - description = "A modern audio book player for Linux using GTK 3"; + description = "A modern audio book player for Linux"; homepage = "https://cozy.geigi.de/"; - maintainers = [ maintainers.makefu ]; - license = licenses.gpl3; + maintainers = with maintainers; [ makefu aleksana ]; + license = licenses.gpl3Plus; + mainProgram = "com.github.geigi.cozy"; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index e48b45aec3e42..c2c9432eaeb0b 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, csound, desktop-file-utils, - fetchFromGitHub, python, python-qt, qmake, + fetchFromGitHub, python3, python-qt, qmake, qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt}/include/PythonQt" + "PYTHONQT_SRC_DIR=${python-qt.src}" "PYTHONQT_LIB_DIR=${python-qt}/lib" "LIBS+=-L${python-qt}/lib" - "INCLUDEPATH+=${python-qt}/include/PythonQt" - "INCLUDEPATH+=${python}/include/python${python.pythonVersion}" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" + "PYTHON_DIR=${python3}" + "PYTHON_VERSION=3.${python3.sourceVersion.minor}" ]; meta = with lib; { diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index dd998050ac707..4bb2926b1b4ea 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.4"; + version = "7.1.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-UNS7kHyxHB4VneELXGn2G8T8EeKUpjb1ib2q0G+gf/s="; + hash = "sha256-NViRZHNgsweoD1YbyWYrRTZPKTCkKk3fGDLLYDD7JfA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/famistudio/build-native-wrapper.nix b/pkgs/applications/audio/famistudio/build-native-wrapper.nix new file mode 100644 index 0000000000000..ddee5bf5712dc --- /dev/null +++ b/pkgs/applications/audio/famistudio/build-native-wrapper.nix @@ -0,0 +1,69 @@ +{ depname +, version +, src +, sourceRoot +, stdenv +, lib +, patches ? [] +, extraPostPatch ? "" +, buildInputs ? [] +}: + +let + rebuildscriptName = if stdenv.hostPlatform.isLinux then + "build_linux" + else if stdenv.hostPlatform.isDarwin then + "build_macos" + else throw "Don't know how to rebuild FamiStudio's vendored ${depname} for ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + pname = "famistudio-nativedep-${depname}"; + inherit version src sourceRoot patches buildInputs; + + postPatch = let + libnameBase = lib.optionalString stdenv.hostPlatform.isLinux "lib" + depname; + in '' + # Use one name for build script, eases with patching + mv ${rebuildscriptName}.sh build.sh + + # Scripts use hardcoded compilers and try to copy built libraries into FamiStudio's build tree + # Not all scripts use the same compiler, so don't fail on replacing that + substituteInPlace build.sh \ + --replace-fail '../../FamiStudio/' "$out/lib/" \ + --replace-quiet 'g++' "$CXX" + + # Replacing gcc via sed, would break -static-libgcc otherwise + sed -i -e "s/^gcc/$CC/g" build.sh + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin rebuild scripts try to make a universal2 dylib + # - build dylib for non-hostPlatform + # - copy built library into special directory for later packaging script + # - join two dylibs together into a universal2 dylib + # Remove everything we don't need + sed -ri \ + -e '/-target ${if stdenv.hostPlatform.isx86_64 then "arm64" else "x86_64"}/d' \ + -e '/..\/..\/Setup/d' \ + build.sh + + # Replace joining multi-arch dylibs with copying dylib for target arch + substituteInPlace build.sh \ + --replace-fail 'lipo -create -output ${libnameBase}.dylib' 'cp ${libnameBase}_${if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"}.dylib ${libnameBase}.dylib #' + '' + extraPostPatch; + + dontConfigure = true; + dontInstall = true; # rebuild script automatically installs + + buildPhase = '' + runHook preBuild + + mkdir -p $out/lib + + # Delete all prebuilt libraries, make sure everything is rebuilt + find . -name '*.so' -or -name '*.dylib' -or -name '*.a' -delete + + # When calling normally, an error won't cause derivation to fail + source ./build.sh + + runHook postBuild + ''; +} diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 9951f0ccfb078..7d738065ce3a3 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -1,59 +1,108 @@ -{ lib -, stdenv -, fetchzip -, autoPatchelfHook -, dotnet-runtime +{ stdenv +, lib +, buildDotnetModule +, callPackage +, fetchFromGitHub , ffmpeg -, libglvnd +, glfw +, libogg +, libvorbis , makeWrapper , openal +, portaudio +, rtmidi }: -stdenv.mkDerivation rec { +let + csprojName = if stdenv.hostPlatform.isLinux then + "FamiStudio.Linux" + else if stdenv.hostPlatform.isDarwin then + "FamiStudio.Mac" + else throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; +in +buildDotnetModule rec { pname = "famistudio"; version = "4.1.3"; - src = fetchzip { - url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; - stripRoot = false; - hash = "sha256-eAdv0oObczbs8QLGYbxCrdFk/gN5DOCJ1dp/tg8JWIc="; + src = fetchFromGitHub { + owner = "BleuBleu"; + repo = "FamiStudio"; + rev = "refs/tags/${version}"; + hash = "sha256-bryxhminkrTVe5qhGeMStZp3NTHBREXrsUlyQkfPkao="; }; - strictDeps = true; + postPatch = let + libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; + buildNativeWrapper = args: callPackage ./build-native-wrapper.nix (args // { + inherit version src; + sourceRoot = "${src.name}/ThirdParty/${args.depname}"; + }); + nativeWrapperToReplaceFormat = args: let + libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; + in { + package = buildNativeWrapper args; + expectedName = "${libPrefix}${args.depname}"; + ourName = "${libPrefix}${args.depname}"; + }; + librariesToReplace = [ + # Unmodified native libraries that we can fully substitute + { package = glfw; expectedName = "libglfw"; ourName = "libglfw"; } + { package = rtmidi; expectedName = "librtmidi"; ourName = "librtmidi"; } + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + { package = openal; expectedName = "libopenal32"; ourName = "libopenal"; } + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + { package = portaudio; expectedName = "libportaudio.2"; ourName = "libportaudio.2"; } + ] ++ [ + # Native libraries, with extra code for the C# wrapping + (nativeWrapperToReplaceFormat { depname = "GifDec"; }) + (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; }) + (nativeWrapperToReplaceFormat { depname = "NotSoFatso"; extraPostPatch = '' + # C++17 does not allow register storage class specifier + substituteInPlace build.sh \ + --replace-fail "$CXX" "$CXX -std=c++14" + ''; }) + (nativeWrapperToReplaceFormat { depname = "ShineMp3"; }) + (nativeWrapperToReplaceFormat { depname = "Stb"; }) + (nativeWrapperToReplaceFormat { depname = "Vorbis"; buildInputs = [ libogg libvorbis ]; }) + ]; + libraryReplaceArgs = lib.strings.concatMapStringsSep " " + (library: "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'") + librariesToReplace; + in '' + # Don't use any prebuilt libraries + rm FamiStudio/*.{dll,dylib,so*} - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; + # Replace copying of vendored prebuilt native libraries with copying of our native libraries + substituteInPlace ${projectFile} ${libraryReplaceArgs} - buildInputs = [ - dotnet-runtime - ffmpeg - libglvnd - openal - ]; + # Un-hardcode target platform if set + sed -i -e '/PlatformTarget/d' ${projectFile} - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall + # Don't require a special name to be preserved, our OpenAL isn't 32-bit + substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ + --replace-fail 'libopenal32' 'libopenal' + ''; - mkdir -p $out/{bin,lib/famistudio} - mv * $out/lib/famistudio + projectFile = "FamiStudio/${csprojName}.csproj"; + nugetDeps = ./deps.nix; - makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ - --add-flags $out/lib/famistudio/FamiStudio.dll \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + executables = [ "FamiStudio" ]; - # Bundled openal lib freezes the application - rm $out/lib/famistudio/libopenal32.so - ln -s ${openal}/lib/libopenal.so $out/lib/famistudio/libopenal32.so + postInstall = '' + mkdir -p $out/share/famistudio + for datdir in Setup/Demo\ {Instruments,Songs}; do + cp -R "$datdir" $out/share/famistudio/ + done + ''; - runHook postInstall + postFixup = '' + # FFMpeg looked up from PATH + wrapProgram $out/bin/FamiStudio \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://famistudio.org/"; description = "NES Music Editor"; @@ -62,10 +111,8 @@ stdenv.mkDerivation rec { or Famicom. It is targeted at both chiptune artists and NES homebrewers. ''; license = licenses.mit; - # Maybe possible to build from source but I'm not too familiar with C# packaging - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "famistudio"; + platforms = platforms.unix; + mainProgram = "FamiStudio"; }; } diff --git a/pkgs/applications/audio/famistudio/deps.nix b/pkgs/applications/audio/famistudio/deps.nix new file mode 100644 index 0000000000000..f3a17967e25c8 --- /dev/null +++ b/pkgs/applications/audio/famistudio/deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/applications/audio/famistudio/update.sh b/pkgs/applications/audio/famistudio/update.sh new file mode 100755 index 0000000000000..15657955c0251 --- /dev/null +++ b/pkgs/applications/audio/famistudio/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts +set -eo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/BleuBleu/FamiStudio/releases?per_page=1" | jq -r '.[0].tag_name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../../.. + +if [[ "$1" != "--deps-only" ]]; then + update-source-version famistudio "$new_version" +fi + +$(nix-build . -A famistudio.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 75b3ae06556fb..bf9ab68f9e888 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.70.3"; + version = "2.72.14"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-QkksliLu2TnJ1GoM91e+Qf3SlRv3T06WNU++S3qq3e0="; + sha256 = "sha256-UBMVU2oAfoAaSQXxZxV+LFq8dyb5dvy/0cCG4XywZVc="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/feishin/darwin.nix b/pkgs/applications/audio/feishin/darwin.nix deleted file mode 100644 index 5da2fa6ee0256..0000000000000 --- a/pkgs/applications/audio/feishin/darwin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv -, lib -, meta -, fetchurl -, unzip -, mpv -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"; - hash = "sha256-sJg3hYOiELm+edw2JTFt6cPFdbDj6mLcLngeqEPaPgs="; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/{Applications/${appname}.app,bin} - cp -R . $out/Applications/${appname}.app - makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index c89d5163c2a6d..5168d084af72a 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -1,27 +1,130 @@ -{ lib -, stdenv -, callPackage -, ... -}@args: - +{ + lib, + buildNpmPackage, + fetchFromGitHub, + electron_27, + copyDesktopItems, + makeDesktopItem, + ... +}: let - extraArgs = removeAttrs args [ "callPackage" ]; + pname = "feishin"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "jeffvli"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Nj8GwrH49ph14xvJldj5GQR4mlt9unCPEcgLrsH/sx8="; + }; + electron = electron_27; +in +buildNpmPackage { pname = "feishin"; - version = "0.5.1"; - appname = "Feishin"; + inherit version; + + inherit src; + npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; + + npmFlags = [ "--legacy-peer-deps" ]; + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ copyDesktopItems ]; + + postPatch = '' + # release/app dependencies are installed on preConfigure + substituteInPlace package.json \ + --replace-fail "electron-builder install-app-deps &&" "" + + # 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-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; + + 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 = '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false + ''; + + installPhase = '' + runHook preInstall + + 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; [ binaryNativeCode ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ fromSource ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + mainProgram = "feishin"; maintainers = with maintainers; [ onny ]; }; - -in -if stdenv.isDarwin -then callPackage ./darwin.nix (extraArgs // { inherit pname appname version meta; }) -else callPackage ./linux.nix (extraArgs // { inherit pname appname version meta; }) +} diff --git a/pkgs/applications/audio/feishin/linux.nix b/pkgs/applications/audio/feishin/linux.nix deleted file mode 100644 index d503492adfc9e..0000000000000 --- a/pkgs/applications/audio/feishin/linux.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, meta -, lib -, fetchurl -, mpv -, graphicsmagick -, electron_24 -, makeDesktopItem -, makeWrapper -, pname -, appname -, version -}: - -let - icon = fetchurl { - url = - "https://github.com/jeffvli/feishin/raw/development/assets/icons/1024x1024.png"; - sha256 = "sha256-8Qigt1CNMa3SDVK2cdqWJuMSl19yfy6nPQfME4qA48I="; - }; - - desktopItem = makeDesktopItem { - name = "feishin"; - desktopName = "Feishin"; - comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - icon = "feishin"; - exec = "feishin %u"; - categories = [ "Audio" "AudioVideo" ]; - mimeTypes = [ "x-scheme-handler/feishin" ]; - }; -in - -stdenv.mkDerivation { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-linux-x64.tar.xz"; - hash = "sha256-uYswGxSXz2YddoFs5F7f+ywqAr7qXqp6WryQ7ENSawQ="; - }; - - - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - # Installs mpv as a requirement - propagatedBuildInputs = [ mpv ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share - cp -r resources $out/share/${pname}/ - cp -r locales $out/share/${pname}/ - - makeWrapper ${electron_24}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/app.asar - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/${appname}.png - done - runHook postInstall - ''; - - shellHook = '' - set -x - export LD_LIBRARY_PATH=${mpv}/lib - set +x - ''; -} diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 56f76f6513c77..9197a21a28e10 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - hash = "sha256-3qLmo9Ibl44v6Jj5Ix17ixwqfPt3ITTXUqBETF5pzE4="; + hash = "sha256-CzKfvQzhF4Mz2WZaJM/Nt6XjF6ThlX4jyQSaXfZukG8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5d11cdff03e8a..1f05808536e18 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.78"; + version = "1.82"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-tGIjhh6F4ePKpMiBPjnpiUfqy8BSvzyeosVZMecCwxM="; + hash = "sha256-qEwPKrgmWYMIwIdgKozG9kghCYp4aoYTX28GqKbuDu4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index d39e49f4b7afd..cc52c197974d1 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "furnace"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tildearrow"; repo = "furnace"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-QUOZGUyZp20ls7rtDK+cmg3Smbd+hl1m9aMhHQmMMbY="; + hash = "sha256-Pv9Sx+bdoy8uV5o9i1rUSuokwQVA8EPYFkZXM8Fynmk="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index b86142ed47b54..5c7d302346e34 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbsplay"; - version = "0.0.96"; + version = "0.0.97"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; rev = version; - sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU="; + sha256 = "sha256-O4t5OzXcrGoxzSXr0nzc01bItjcp1LvFeWnbdSUDwFU="; }; configureFlags = [ diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 011f06fd3ad5c..9b1b5fb7c685f 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -1,22 +1,23 @@ { lib, stdenv, fetchFromGitLab, cmake, pkg-config, libsndfile, rapidjson -, libjack2, lv2, libX11, cairo }: +, libjack2, lv2, libX11, cairo, openssl }: stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.1"; + version = "3.4.0"; src = fetchFromGitLab { - owner = "iurie-sw"; + owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; + sha256 = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo ]; + buildInputs = [ libsndfile rapidjson libjack2 lv2 libX11 cairo openssl ]; - # https://github.com/iurie-sw/geonkick/issues/120 + # Without this, the lv2 ends up in + # /nix/store/$HASH/nix/store/$HASH/lib/lv2 cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 3d67cb7d46e92..944b2aa1aef13 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { owner = "go-musicfox"; - repo = pname; + repo = "go-musicfox"; rev = "v${version}"; - hash = "sha256-QZHuQAOnthSm7Kb82i3NUWTnKk+9OMHV5vzOU72inX0="; + hash = "sha256-J6R3T92cHFUkKwc+GKm612tVjglP2Tc/kDUmzUMhvio="; }; deleteVendor = true; - vendorHash = "sha256-6DeoxpjVfykBI3fJAJpMZwJ4VTooIbxGpk5+SW198hU="; + vendorHash = "sha256-KSIdBEEvYaYcDIDmzfRO857I8FSN4Ajw6phAPQLYEqg="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 6ca3f39a9dc08..54bd0cad3593e 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.0"; + version = "3.14.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-kPz11V2yNmBe80egNLYxh/m2B1nDca3C5sGbEnrkqnw="; + hash = "sha256-EyMTWsaqJX7H7aCbu5ww9tQBMwJ7BzobWMWg5Y/ZgJE="; }; postPatch = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 2134370eac9f4..c1d1cf5571c50 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , avahi , bluez , boost @@ -42,29 +41,19 @@ let inherit (lib) optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guitarix"; - version = "0.44.1"; + version = "0.46.0"; - src = fetchurl { - url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; + src = fetchFromGitHub { + owner = "brummer10"; + repo = "guitarix"; + rev = "V${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-AftC6fQEDzG/3C/83YbK/++bRgP7vPD0E2X6KEWpowc="; }; - patches = [ - (fetchpatch { - name = "gcc13-fixes.patch"; - url = "https://github.com/brummer10/guitarix/commit/b52736180b6966f24398f8a5ad179a58173473ec.patch"; - hash = "sha256-+jilgLujy/B6ijUb8NHzt3+4IKCt17X8LmuMLdmsvGw="; - relative = "trunk"; - }) - ]; - - # doesnt apply cleanly, so doing with substituteInPlace - # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch - postPatch = '' - substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')" - ''; + sourceRoot = "${finalAttrs.src.name}/trunk"; nativeBuildInputs = [ gettext @@ -140,9 +129,9 @@ stdenv.mkDerivation rec { clean-sounds, nice overdrive, fat distortion and a diversity of crazy sounds never heard before. ''; - homepage = "http://guitarix.sourceforge.net/"; + homepage = "https://github.com/brummer10/guitarix"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ astsmtl goibhniu ]; + maintainers = with maintainers; [ astsmtl goibhniu lord-valen ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index 26a9bd4164c8d..f8fb4cedbc9ff 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.5"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-uUmaTqUiih4nVt4Cba77WDt4xGQixsBe3WNavBDanx0="; + sha256 = "sha256-rZ8oaud+ovJ7t+SGnWe7QbqjQns1EkbbwpdE+rLr6nc="; }; preConfigure = '' diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 1aa79a69e5239..cae02e03e613c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,4 @@ -{ - chromaprint +{ chromaprint , cmake , docbook_xml_dtd_45 , docbook_xsl @@ -7,25 +6,43 @@ , ffmpeg , flac , id3lib +, kdePackages , lib , libogg , libvorbis , libxslt , mp4v2 -, phonon , pkg-config , python3 , qtbase +, qtdeclarative , qtmultimedia -, qtquickcontrols , qttools , readline , stdenv , taglib , wrapQtAppsHook , zlib +, withCLI ? true +, withKDE ? true +, withQt ? false }: +let + inherit (lib) optionals; + + apps = lib.concatStringsSep ";" ( + optionals withCLI [ "CLI" ] + ++ optionals withKDE [ "KDE" ] + ++ optionals withQt [ "Qt" ] + ); + + mainProgram = + if withQt then "kid3-qt" + else if withKDE then "kid3" + else "kid3-cli"; + +in stdenv.mkDerivation (finalAttrs: { pname = "kid3"; version = "3.9.5"; @@ -41,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xsl pkg-config python3 + qttools wrapQtAppsHook ]; @@ -53,25 +71,32 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libxslt mp4v2 - phonon qtbase + qtdeclarative qtmultimedia - qtquickcontrols - qttools readline taglib zlib - ]; + ] ++ lib.optionals withKDE (with kdePackages; [ + kconfig + kconfigwidgets + kcoreaddons + kio + kxmlgui + phonon + ]); - cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; - NIX_LDFLAGS = "-lm -lpthread"; + cmakeFlags = [ (lib.cmakeFeature "WITH_APPS" apps) ]; - preConfigure = '' - export DOCBOOKDIR="${docbook_xsl}/xml/xsl/docbook/" - ''; + env = { + DOCBOOKDIR = "${docbook_xsl}/xml/xsl/docbook/"; + LANG = "C.UTF-8"; + NIX_LDFLAGS = "-lm -lpthread"; + }; meta = { description = "A simple and powerful audio tag editor"; + inherit mainProgram; homepage = "https://kid3.kde.org/"; license = lib.licenses.lgpl2Plus; longDescription = '' @@ -103,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { - Edit synchronized lyrics and event timing codes, import and export LRC files. ''; - maintainers = [ lib.maintainers.AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index a7a48b240e2b8..9fd74e930a028 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }: +{ lib, stdenv, fetchurl, cmake, pandoc, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }: stdenv.mkDerivation rec { pname = "kmetronome"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1ln0nm24w6bj7wc8cay08j5azzznigd39cbbw3h4skg6fxd8p0s7"; + hash = "sha256-51uFAPR0xsY3z9rFc8SdSGu4ae/VzUmC1qC8RGdt48Y="; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pandoc pkg-config qttools ]; buildInputs = [ alsa-lib drumstick qtbase qtsvg ]; diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index 62ba0f90ace93..bcbe1bc397d3e 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchPypi -, python3 +{ + lib, + fetchPypi, + python3, }: python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.94"; + version = "2.0.96"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-l498NXt3Ib9QLTWoJcpngAwkbY6JqLbVLKhTWQye7Fs="; + hash = "sha256-nvPHAnoD5j1rneeuMufQkXj8YWXau2zJYug+Avpe87I="; }; pythonRelaxDeps = true; @@ -20,13 +21,14 @@ python3.pkgs.buildPythonPackage rec { "rpi-ws281x" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ cython poetry-core - pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; + + dependencies = with python3.pkgs; [ aiohttp aiohttp-cors aubio diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 93e16098a84cf..f2d512c721a82 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxsampler"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls="; + sha256 = "sha256-T7quk5N5JBiPqIziQd0vaCr8tLDbwS6otz6egY01OTE="; }; preConfigure = '' diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 9bf9c35d4bd7f..5a7ef4417876b 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-4FNFaVi+fxoXo2tl+bynHqh8yRt0Q4z/El/4m0GXZUY="; + hash = "sha256-QHhSrmBNvUTffPzjns670Tn3Z3UDcDvarq605Qx9k4w="; }; - cargoHash = "sha256-FS7OYzKx/lQh86QQ8Dk9v1JrWUxPHNz3kITiEJ3sNng="; + cargoHash = "sha256-vtU439Pd3zWx+qakh1xTENQhun7S+WsJMndXqPWrPWU="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index fcfafbdb4bbfc..2edf4cd5a9285 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , xxd @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "2.3"; + version = "2.6"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "sha256-Dj8yPmuEtDVgu6Gm6aEY+dgJ0dtwB8RPg9EuaVAsiIs="; + hash = "sha256-S1+nGnB1LHIUgYves0qtWh+QXYKjtKWICpOo38b3zbY="; fetchSubmodules = true; }; @@ -37,8 +38,5 @@ stdenv.mkDerivation rec { license = licenses.bsd0; maintainers = with maintainers; [ magnetophon orivej ]; platforms = platforms.linux; - # 2023-08-19, `-Werror=format-security` fails for xputty - # reported as https://github.com/brummer10/libxputty/issues/12 - broken = true; }; } diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/applications/audio/miniplayer/default.nix index 018fd6c8b78f3..e3837baeca048 100644 --- a/pkgs/applications/audio/miniplayer/default.nix +++ b/pkgs/applications/audio/miniplayer/default.nix @@ -15,7 +15,11 @@ buildPythonApplication rec { hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ colorthief ffmpeg-python mpd2 @@ -25,6 +29,8 @@ buildPythonApplication rec { ueberzug ]; + doCheck = false; # no tests + # pythonImportsCheck is disabled because this package doesn't expose any modules. meta = with lib; { diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index d4da27dd36392..c68d14b28f990 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.52"; + version = "10.60"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-n+bQzvuCTt7dnqkPO592KKZeShmMlbp/KAXK0F2dlTg="; + hash = "sha256-llOo9G65UDDCzaSahq5qssw6SmOJ5C9qS2bdXB/pKF0="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/jellyfin.nix b/pkgs/applications/audio/mopidy/jellyfin.nix index d7d808cf685d5..932983aa4ddaf 100644 --- a/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/pkgs/applications/audio/mopidy/jellyfin.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-jellyfin"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit version; pname = "Mopidy-Jellyfin"; - sha256 = "ny0u6HdOlZCsmIzZuQ1rql+bvHU3xkh8IdwhJVHNH9c="; + sha256 = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; }; propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 7a666da0d23f3..f7480557eb5e6 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -15,17 +15,18 @@ , jack , withConplay ? !stdenv.hostPlatform.isWindows , perl +, writeScript }: assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.5"; + version = "1.32.6"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-r5CM32zbZUS5e8cGp5n3mJTmlGivWIG/RUoOu5Fx7WM="; + hash = "sha256-zN0dCrwx1z2LQ1/GWMeQSdCpBbMGabakKgOtFp3GCeY="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; @@ -69,6 +70,20 @@ stdenv.mkDerivation rec { --prefix PATH : $out/bin ''; + passthru = { + updateScript = writeScript "update-mpg123" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + # Expect the text in format of '<a href="download/mpg123-1.32.6.tar.bz2">' + new_version="$(curl -s https://mpg123.org/download.shtml | + pcregrep -o1 '<a href="download/mpg123-([0-9.]+).tar.bz2">')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index d6c90f896dfd8..707ec5c8ebfe8 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , wrapQtAppsHook , pkg-config @@ -129,7 +128,7 @@ in stdenv'.mkDerivation (finalAttrs: { mkdir -p "$out/Applications" mv "$out/mscore.app" "$out/Applications/mscore.app" mkdir -p $out/bin - ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore. + ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore ''; # Don't run bundled upstreams tests, as they require a running X window system. @@ -143,5 +142,6 @@ in stdenv'.mkDerivation (finalAttrs: { license = licenses.gpl3Only; maintainers = with maintainers; [ vandenoever doronbehar ]; mainProgram = "mscore"; + platforms = platforms.unix; }; }) diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/applications/audio/muzika/default.nix index 86a3f19619831..d3b4e3d274522 100644 --- a/pkgs/applications/audio/muzika/default.nix +++ b/pkgs/applications/audio/muzika/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils , fetchFromGitHub , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , gjs , glib-networking , gobject-introspection @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ninja nodejs pkg-config - prefetch-yarn-deps + fixup-yarn-lock wrapGAppsHook4 yarn ]; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index bf60c8a4439d4..cae2a3b7f1a9c 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 = "14.1.0"; + version = "14.1.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-yNB5WQi3M4cYogtxx/vLi2xJog2keyFrJIMlx663DLo="; + sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index e70a2eb26f174..597f87337caeb 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -6,12 +6,13 @@ , ncurses , openssl , Cocoa -, withALSA ? true, alsa-lib +, withALSA ? false, alsa-lib , withClipboard ? true, libxcb, python3 , withCover ? false, ueberzug -, withPulseAudio ? false, libpulseaudio +, withPulseAudio ? true, libpulseaudio , withPortAudio ? false, portaudio , withMPRIS ? true, withNotify ? true, dbus +, withCrossterm ? true , nix-update-script , testers , ncspot @@ -54,6 +55,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMPRIS "mpris" + ++ lib.optional withCrossterm "crossterm_backend" ++ lib.optional withNotify "notify"; postInstall = '' diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 1c457c8a0e7b7..17d90c6d310b2 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -4,7 +4,6 @@ , scons , boost , ladspaH -, libcxxabi }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "-fomit-frame-pointer -ffast-math -mfpmath=sse" "-I${boost.dev}/include -I${ladspaH}/include" \ --replace "env.has_key('cxx')" "True" \ --replace "env['cxx']" "'${stdenv.cc.targetPrefix}c++'" \ - --replace "-Wl,--strip-all" "${lib.optionalString stdenv.isDarwin "-L${libcxxabi}/lib"}" + --replace "-Wl,--strip-all" "" substituteInPlace filters.cpp \ --replace "LADSPA_HINT_SAMPLE_RATE, 0, 0.5" "LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5" diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index b789dc668a8e4..60b9bc23bc362 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-uw9vj12vs2N4nap6z1L6sGoCuPpRCmvfGoK/b+zHwHA="; + hash = "sha256-hBQyz6VAtiC1XOADZml1MwGKtmdyiJNlRAmHRjt6QsA="; }; # Remove some Electron stuff from package.json diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index d05130de41248..927de1d938569 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -10,23 +10,24 @@ , hicolor-icon-theme , isocodes , itstool +, libadwaita , libxml2 , meson , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "parlatype"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq"; + sha256 = "0546rl5sm7xmgl54cqps3a7bhfs7xdvz98jgdcf4sgiz1k2vh9xq"; }; nativeBuildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -53,9 +54,12 @@ stdenv.mkDerivation rec { gtk4 hicolor-icon-theme isocodes + libadwaita ]; postPatch = '' + substituteInPlace data/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs data/meson_post_install.py patchShebangs libparlatype/tests/data/generate_config_data ''; @@ -72,7 +76,8 @@ stdenv.mkDerivation rec { useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - homepage = "https://www.parlatype.org/"; + # maintainer lost control of parlatype.org + homepage = "https://github.com/gkarsay/parlatype"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index 04153c54d9baa..8520b92015555 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -12,21 +12,18 @@ , yt-dlp , Security }: -let - version = "1.6.0"; -in rustPlatform.buildRustPackage { pname = "parrot"; - inherit version; + version = "1.6.0-unstable-2024-02-28"; src = fetchFromGitHub { owner = "aquelemiguel"; repo = "parrot"; - rev = "v${version}"; - hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c="; + rev = "fcf933818a5e754f5ad4217aec8bfb16935d7442"; + hash = "sha256-3YTXIKj1iqCB+tN7/0v1DAaMM6aJiSxBYHO98uK8KFo="; }; - cargoHash = "sha256-e4NHgwoNkZ0//rugHrP0gU3pntaMeBJsV/YSzJfD8r4="; + cargoHash = "sha256-3G7NwSZaiocjgfdtmJVWfMZOHCNhC08NgolPa9AvPfE="; nativeBuildInputs = [ cmake makeBinaryWrapper pkg-config ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 6274d448ad51e..6ea7b2f885368 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.06"; + version = "6.4.07"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-eZYNXNmxrvI+jR1UEgXrsUTriZ8zTTwM9cEy7HgiZzs="; + hash = "sha256-r36znpkyI6/UPtOm1ZjedOadRG1BiIscRV9qRLf/A5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 46958b01bd1c9..4d81f3f212bbb 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-03-04"; + version = "unstable-2024-04-01"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; - hash = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk="; + rev = "37d8da11774c6eff3d1c2902ac883dace178e832"; + hash = "sha256-BGIbf7jtrspFqURyy2AIYKSSkcirLgj0oUBq0CHl+2s="; }; cargoLock = { diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index fb74db8ccb995..5598c443b3c6b 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644 -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 = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; ++pub const GIT_VERSION: &str = "37d8da11774c6eff3d1c2902ac883dace178e832"; +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/psst/update.sh b/pkgs/applications/audio/psst/update.sh index a504b61c2410a..4ffa9417f0401 100755 --- a/pkgs/applications/audio/psst/update.sh +++ b/pkgs/applications/audio/psst/update.sh @@ -24,7 +24,9 @@ if [ -z "$rev" ]; then rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits?per_page=1" | jq -r '.[0].sha')" fi -version="unstable-$(date +%F)" +date="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/jpochyla/psst/commits/$rev" | jq -r '.commit.author.date' | cut -dT -f1)" + +version="unstable-$date" # Sources src_hash=$(nix-prefetch-github jpochyla psst --rev "$rev" | jq -r .hash) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 0f4bb9957f7a8..c4213c06f8bcb 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.66.1"; + version = "1.67"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-j7VPC1sj1Q+wL2TBgv06uYLPqym8F57HG1SRvj0Ggeo="; + sha256 = "sha256-fTUTXwS6A72zhKkANlSljQVvPeN5rOTyuyb8vLxYfdk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index ddeee09d829df..3b6e215d2ffbd 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,24 +1,12 @@ { lib , fetchFromGitHub +, fetchurl , python3 +, qtbase +, qtwayland , wrapQtAppsHook }: -# As of 2.1, puddletag has started pinning versions of all dependencies that it -# was built against which is an issue as the chances of us having the exact same -# versions in nixpkgs are slim to none. -# -# There is a difference between explicit and implicit version requirements and -# we should be able to safely ignore the latter. Therefore use requirements.in -# which contains just the explicit version dependencies instead of -# requirements.txt. -# -# Additionally, we do need to override some of the explicit requirements through -# `overrideVersions`. While we technically run the risk of breaking something by -# ignoring the pinned versions, it's just something we will have to accept -# unless we want to vendor those versions. - - python3.pkgs.buildPythonApplication rec { pname = "puddletag"; version = "2.3.0"; @@ -31,6 +19,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8="; }; + patches = [ + (fetchurl { + url = "https://github.com/puddletag/puddletag/commit/54074824adb05da42c03d7adfbba94d8e24982f0.patch"; + hash = "sha256-DkgaFWgp2m2bRuhdXhHW+nxV/2GaCgeRNdwLMYAkcYQ="; + name = "fix_for_pyparsing_3_1_2.patch"; + }) + ]; + pythonRelaxDeps = true; pythonRemoveDeps = [ @@ -43,6 +39,11 @@ python3.pkgs.buildPythonApplication rec { --replace share/pixmaps share/icons ''; + buildInputs = [ + qtbase + qtwayland + ]; + nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook wrapQtAppsHook @@ -63,11 +64,13 @@ python3.pkgs.buildPythonApplication rec { # the file should be executable but it isn't so our wrapper doesn't run preFixup = '' chmod 555 $out/bin/puddletag - wrapQtApp $out/bin/puddletag + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; doCheck = false; # there are no tests + dontWrapQtApps = true; # to avoid double-wrapping + dontStrip = true; # we are not generating any binaries meta = with lib; { diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock index 035a6d9af2f8a..c894d9222ae7a 100644 --- a/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ b/pkgs/applications/audio/pwvucontrol/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -25,11 +25,11 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.64.0" +version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -40,7 +40,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] @@ -51,9 +51,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitmaps" @@ -76,7 +76,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -137,6 +137,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", + "libloading", ] [[package]] @@ -226,7 +227,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -287,9 +288,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8965ed5455cbfa1eb45c14a3b971cbacb43481913a3a5b9078b2ef0d9a01bd4b" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -302,9 +303,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeffd4a7d68046c28666d817071bf025254aaed4df35099443f0c306ca6177f3" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -375,7 +376,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -404,7 +405,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -459,9 +460,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b3b9e8090acb325d08cde84b30fc29b963a75fbac93160e9c5a30d2b335742" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ "cairo-rs", "gdk4", @@ -474,9 +475,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0770d1ede7189092748c4ef5b6921264eb945fd2318a58e8f59dc273000810f8" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -490,9 +491,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0973f9b9ade10fc22403810b7283d47b533033715f2aaa36288cd3bf90d63efc" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ "cairo-rs", "field-offset", @@ -511,9 +512,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9f2c4530f3168fe506b0be7bc15f7a93ef38d020edb27d81a921a26cbca851" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -525,9 +526,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19fde71ef2e78ac8fb18073c345b5f29609048d4045a345613645aa1163243c1" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -629,11 +630,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[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 = "libspa" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcdea6b6663acf456641a4dea1b87fa6970a3e881596237713192d8f5423b542" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "cc", "convert_case", "cookie-factory", @@ -646,8 +658,9 @@ dependencies = [ [[package]] name = "libspa-sys" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63fc701d3375e6e255765d6a6172d9af06583115e78f3dfe2c8ff1dfd0b2dab" dependencies = [ "bindgen", "cc", @@ -669,9 +682,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "malloc_buf" @@ -816,11 +829,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pipewire" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062c97c31818918b8bffdc66cfd93f3e4b4141f505c63234f9ff0a658fddedab" dependencies = [ "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "libc", "libspa", "libspa-sys", @@ -832,8 +846,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.6.0" -source = "git+https://gitlab.freedesktop.org/saivert/pipewire-rs?branch=misc_fixes#46bfbd8bdf0ad3ff1d25d02b2e36f97333c78e23" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d558e2cffe5f97ac32c7e0b6cb6074b5271b8c2c628ac68633342ee08fdab308" dependencies = [ "bindgen", "libspa-sys", @@ -908,9 +923,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1045,9 +1060,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1081,22 +1096,22 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1187,9 +1202,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winnow" -version = "0.5.4" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" +checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" dependencies = [ "memchr", ] @@ -1197,9 +1212,9 @@ dependencies = [ [[package]] name = "wireplumber" version = "0.1.0" -source = "git+https://github.com/saivert/wireplumber.rs.git?branch=use_pipewire_from_git#8dbf383ce54dee7b8d578b87c13f3507a65291f8" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "gio", "glib", "libc", @@ -1213,7 +1228,7 @@ dependencies = [ [[package]] name = "wireplumber-sys" version = "0.1.0" -source = "git+https://github.com/saivert/wireplumber.rs.git?branch=use_pipewire_from_git#8dbf383ce54dee7b8d578b87c13f3507a65291f8" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=341b0c4e8d177f5f21c109cf88cca4f2dc1f853a#341b0c4e8d177f5f21c109cf88cca4f2dc1f853a" dependencies = [ "gio-sys", "glib-sys", diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix index 935fadb5f2fb6..ae631e1ff5166 100644 --- a/pkgs/applications/audio/pwvucontrol/default.nix +++ b/pkgs/applications/audio/pwvucontrol/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchFromGitLab , cargo , desktop-file-utils , meson @@ -19,22 +20,33 @@ , wireplumber }: +let + wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { + version = "0.4.17"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }); +in stdenv.mkDerivation rec { pname = "pwvucontrol"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; rev = version; - hash = "sha256-jBvMLewBZi4LyX//YUyJQjqPvxnKqlpuLZAm9zpDMrA="; + hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "libspa-0.6.0" = "sha256-CVLQ9JXRMo78/kay1TpRgRuk5v/Z5puPVMzLA30JRk8="; - "wireplumber-0.1.0" = "sha256-wkku9vqIMdV+HTkWCPXKH2KM1Xzf0xApC5zrVmgxhsA="; + "wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ="; }; }; @@ -58,7 +70,7 @@ stdenv.mkDerivation rec { libadwaita pango pipewire - wireplumber + wireplumber_0_4 ]; meta = with lib; { diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 9748c9f16111b..e3bf3acf98d9b 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.9.2.25"; + version = "0.9.3.2"; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-GkOp0iK84HDvVH8RmtmIKJ5EtQIECgZS5g8pmaIhUcc="; + hash = "sha256-aIWU68bdPUsIh8QRNnF0NcK7FemmYyUHbJg9KcUALBk="; }; nativeBuildInputs = [ @@ -42,6 +42,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "pyradio"; changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ contrun ]; + maintainers = with maintainers; [ contrun yayayayaka ]; }; } diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index de419c8fa48cb..0867919ab47e7 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.6.2"; + version = "0.6.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-GlXUQz7tj7dfxVikvu0idzhQaq7raFC9jxJ2zFeHBQU="; + sha256 = "sha256-mTWmXHC9KkXgUIO5CIcGOoYYLx+5si/LETSmHFhmrRE="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 965c3e723e807..714a66f6e2c8c 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,26 +1,20 @@ -{ lib, fetchurl, alsa-lib, fluidsynth, libjack2, autoconf, pkg-config -, mkDerivation, qtbase, qttools, qtx11extras +{ lib, stdenv, fetchurl, alsa-lib, fluidsynth, libjack2, cmake, pkg-config +, qtbase, qttools, qtx11extras, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.4"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "sha256-dlgIkMde7uv4UlMKEPhtZ7MfSTBc7RvHs+Q2yk+G/JM="; + hash = "sha256-SvgZrdS6BwWhNgbovcfhpQKVcu0iwr4dDqeIckuo1fk="; }; - nativeBuildInputs = [ autoconf pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ alsa-lib fluidsynth libjack2 qtbase qttools qtx11extras ]; - enableParallelBuilding = true; - # Missing install depends: - # lrelease error: Parse error at src/translations/qsynth_ru.ts:1503:33: Premature end of document. - # make: *** [Makefile:107: src/translations/qsynth_ru.qm] Error 1 - enableParallelInstalling = false; - meta = with lib; { description = "Fluidsynth GUI"; mainProgram = "qsynth"; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index e78502eb23f75..4b693da3a622f 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - patches = [ ./fltk-path.patch ]; + patches = [ + ./fltk-path.patch + # https://sourceforge.net/p/rakarrack/git/merge-requests/2/ + ./looper-preset.patch + ]; buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; diff --git a/pkgs/applications/audio/rakarrack/looper-preset.patch b/pkgs/applications/audio/rakarrack/looper-preset.patch new file mode 100644 index 0000000000000..42e5057dcefe8 --- /dev/null +++ b/pkgs/applications/audio/rakarrack/looper-preset.patch @@ -0,0 +1,11 @@ +diff -Naurd rakarrack-0.6.1/src/Looper.C rakarrack-0.6.1-segfault/src/Looper.C +--- rakarrack-0.6.1/src/Looper.C 2010-10-01 01:27:55.000000000 +0000 ++++ rakarrack-0.6.1-segfault/src/Looper.C 2023-12-08 21:12:31.818569726 +0000 +@@ -34,6 +34,7 @@ + efxoutr = efxoutr_; + + //default values ++ Ppreset = 0; + Pclear = 1; + Pplay = 0; + Precord = 0; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index ba84f8c2aba4f..7adba1d0c1566 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.11"; + version = "7.15"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-8GWfrr+kKF3Ei6Fed9Oei461veRXXbTICvyNJNLBbYM=" else { - x86_64-linux = "sha256-lpgGXHWWhhs1jLllq5C3UhOLgLyMTE6qWFiGkBcuWlo="; - aarch64-linux = "sha256-0iTdrZYjKzPyNLMIM4othtAMox/65HBEy1VickOZFnA="; + hash = if stdenv.isDarwin then "sha256-7tWgbHIkARgsPi0buvbQb4qTqndyPwRRqut1Gj4WNZE=" else { + x86_64-linux = "sha256-O1xh+DKwPKTcQrNhWMX5ErKa1hXq0yeyt/XJMQav11c="; + aarch64-linux = "sha256-rQE8Aa+iFWpA18udCXm4JW8BPTEDeEQAupy353Sbcl8="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index d3462ecc6ad5a..a56d43876fb04 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { releasePath else let - platform = platforms.${stdenv.system}; + platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; in fetchurl { url = diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 94b082fd84a4f..bc6a406ba2f5c 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240308"; + version = "20240328"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-6MzMmeD4HCS/7VTFTAcOhyKjz5NvzvDEzcSpHGUwFvM="; + sha256 = "sha256-hoP/14lbqsuQ37oJDErPoQWWk04UshImmApCFrf5wno="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 8f47ab0b6a20d..51d40f962a889 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.90.5"; + version = "0.99.12"; src = fetchFromGitHub { owner = "ahlstromcj"; - repo = pname; + repo = "seq66"; rev = version; - sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; + hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; @@ -18,13 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib libjack2 liblo qtbase ]; postPatch = '' - for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do - substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' + for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do + substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}' done - - # gcc-13 headers compatibilty. TODO: try to remove with next version - # update - sed -e '1i #include <cstdint>' -i libseq66/src/os/daemonize.cpp ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 1fa19adc573bf..72e3e380a8481 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-bAd4fq5tlBYfYuIG/02MCbEwjjVBZFJbZJNT13voInw="; + hash = "sha256-bIX9BByUdScbS0NCrUjF5PTHG9T6hrPGjD5XM0eQgfA="; }; strictDeps = true; diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index eb51b2cd6e4bb..bf308fd29d280 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "soundtracker"; - version = "1.0.4"; + version = "1.0.5"; src = fetchzip { # Past releases get moved to the "old releases" directory. @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. url = "mirror://sourceforge/soundtracker/soundtracker-${finalAttrs.version}.tar.xz"; - hash = "sha256-kNt0BSRaEQY+oa1xbuZ1l6nCqXhcktVugxzcC3ZDaX0="; + hash = "sha256-g96Z1SdFGMq7WFI6x+UtmAHPZF0C+tHUOjNhmK2ld8I="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -75,5 +75,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + hydraPlatforms = platforms.linux; # sdl-config times out on darwin }; }) diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 0e4e5234ec003..e4e02f03891b9 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o="; + hash = "sha256-TwMQtyg8ygFTI5DgT5rBVkZE31U4puaANIo5S8W0TXU="; }; - cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U="; + cargoHash = "sha256-RTvMywRWdZiBgNMjlUGa4jlD0HYOL3ESkVppGlsl4So="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 4f6460bd3a2d0..d5947d145172b 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.9"; + version = "3.11"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8rLpasgXiaL2KpGnYMQdNN2ayjcSkmz5hDkNBnKNWHk="; + sha256 = "sha256-Dm+ELHtYZGSzJSrERtvpuuV5cVZ9ah9WQ0iTTJqGqVg="; }; buildInputs = [ libxcb qtbase qtsvg ]; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 3fd633506b2d4..deaec9e16d7cc 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1468"; + version = "2.0.0.1486"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "fd89d67b1b9a17a6dd212be0c91d0417b440f60a"; - hash = "sha256-wYVRlv+Y1jvdAGlj2zXKUhQBwWX9pGgNX6U71PsfySg="; + rev = "fd4a82e7d0e53124d9618320f3c115d90654509d"; + hash = "sha256-nR2Px7VYjAktUsueEyBAV2392+/dX6JYIy7YSMh05c0="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index b2cf3a5d842dc..2ce12df23dcf6 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -26,6 +26,7 @@ let rev = "refs/tags/${version}"; hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; + doCheck = false; # no tests }); dataclasses-json = super.dataclasses-json.overridePythonAttrs (oldAttrs: rec { diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 9f234b5e71c04..63cf1110d7849 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , cmake -, gitMinimal , pkg-config , alsa-lib , freetype @@ -23,15 +22,12 @@ stdenv.mkDerivation rec { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; - branchName = "release-xt/${version}"; fetchSubmodules = true; - leaveDotGit = true; - sha256 = "sha256-q6qs/OhIakF+Gc8Da3pnfkUGYDUoJbvee0o8dfrRI2U="; + sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ="; }; nativeBuildInputs = [ cmake - gitMinimal pkg-config ]; diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/applications/audio/synaesthesia/default.nix index 765e724cd8ecb..c8575d77b50fa 100644 --- a/pkgs/applications/audio/synaesthesia/default.nix +++ b/pkgs/applications/audio/synaesthesia/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Program for representing sounds visually"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.infinisil ]; + maintainers = [ ]; mainProgram = "synaesthesia"; }; } diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 09136728a4b9f..2d7a3f441e4c6 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.7.1"; + version = "7.7.2"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-rRYM8wdvwfetoIpS/lzAV/uV5XVpXyXsHSrClPWcsCo="; + hash = "sha256-IVl7XL6nn42zaY4bDraF9os0dXfquUql4E96djfVdVg="; }; postUnpack = '' diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 0df3cfcb46b88..c36240558b722 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -22,16 +22,26 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.7.11"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tramhao"; repo = "termusic"; rev = "v${version}"; - hash = "sha256-ykOBXM/WF+zasAt+6mgY2aSFCpGaYcqk+YI7YLM3MWs="; + hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q="; }; - cargoHash = "sha256-BrOpU0RFdlRXQIMjfHfs/XYIdBCYKFSA+5by/rGzC8Y="; + postPatch = '' + pushd $cargoDepsCopy/stream-download + oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) + substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \ + --replace-warn '#![doc = include_str!("../README.md")]' "" + substituteInPlace .cargo-checksum.json \ + --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + popd + ''; + + cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM="; nativeBuildInputs = [ pkg-config @@ -62,5 +72,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tramhao/termusic"; license = with lib.licenses; [ gpl3Only ]; maintainers = with lib.maintainers; [ devhell ]; + mainProgram = "termusic"; }; } diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index bb3986dd88aa7..d9d14b9670db7 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-t79GNCqY99JfCT+4wO3CTtLXFdKQudMw4pZNiJzOufo="; + sha256 = "sha256-+sRXpRAtbLpQlyJUhbc1Cuzh6aV8HRvYH/ja9sfvKoA="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 99d0fba6fa95c..bcd078eeb9f1b 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.2.9.200"; + version = "1.3.0.202"; 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-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo="; - armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY="; - x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo="; + aarch64-linux = "sha256-qsjZ/oo2V6mknrMktuTP188hp57oiPxO/iwp3G57JXU="; + armv7l-linux = "sha256-33SnAYumfnZlxKms3fANt9wRJghaQHUstZbKqTxBF3Q="; + x86_64-linux = "sha256-4SE2iw45sLyapYLCd31xT/aZMTmetsjmgfWFf0FrluI="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c0067779b7b2f..c086436de09ff 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -4,7 +4,6 @@ , curl , fetchFromBitbucket , fetchFromGitHub -, fetchzip , ghc_filesystem , glew , glfw @@ -19,8 +18,6 @@ , libjack2 , libpulseaudio , libsamplerate -, libXext -, libXi , makeDesktopItem , makeWrapper , pkg-config @@ -114,8 +111,8 @@ let }; in stdenv.mkDerivation rec { - pname = "VCV-Rack"; - version = "2.4.0"; + pname = "vcv-rack"; + version = "2.4.1"; desktopItems = [ (makeDesktopItem { @@ -135,7 +132,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "0azrqyx5as4jmk9dxb7cj7x9dha81i0mm9pkvdv944qyccqwg55i"; + hash = "sha256-Gn/sFltLXX2mLv4dDqmr/UPd+JBXVkIZGwMI6Rm0Ih4="; }; patches = [ @@ -169,6 +166,10 @@ stdenv.mkDerivation rec { cp -r ${fundamental-source} plugins/Fundamental/ chmod -R +rw plugins/Fundamental # will be used as build dir substituteInPlace plugin.mk --replace ":= all" ":= dist" + substituteInPlace plugins/Fundamental/src/Logic.cpp \ + --replace \ + "LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>" \ + "struct rack::componentlibrary::LightButton<VCVBezelBig, VCVBezelLightBig<WhiteLight>>" # Fix reference to zenity substituteInPlace dep/osdialog/osdialog_zenity.c \ diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index 2dae5a5f0d379..ed8cb27b506eb 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "vgmstream"; - version = "1896"; + version = "1917"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; rev = "refs/tags/r${version}"; - sha256 = "sha256-1BWJgV631MxxzdUtK8f+XRb9cqfhjlwN2LgWI0VmIHE="; + sha256 = "sha256-9HIa5/whdLouUWNFml7tPfXStIkO76dxUl5S4yiat64="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/applications/audio/waylyrics/Cargo.lock b/pkgs/applications/audio/waylyrics/Cargo.lock index 2c87d54dd27aa..011548f114ade 100644 --- a/pkgs/applications/audio/waylyrics/Cargo.lock +++ b/pkgs/applications/audio/waylyrics/Cargo.lock @@ -18,6 +18,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] name = "ahash" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -29,10 +40,23 @@ dependencies = [ ] [[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -48,9 +72,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arrayvec" @@ -66,9 +90,9 @@ checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" [[package]] name = "async-channel" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", "event-listener", @@ -79,13 +103,36 @@ 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 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "atk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" +dependencies = [ + "atk-sys", + "glib 0.18.5", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", ] [[package]] @@ -101,15 +148,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -122,9 +169,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + +[[package]] +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bitflags" @@ -134,9 +187,12 @@ 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" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -157,10 +213,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] name = "borsh" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +checksum = "0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6" dependencies = [ "borsh-derive", "cfg_aliases", @@ -168,23 +233,23 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +checksum = "51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5" dependencies = [ "once_cell", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "syn_derive", ] [[package]] name = "bumpalo" -version = "3.15.2" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" @@ -204,51 +269,91 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] -name = "bytes" +name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +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" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +dependencies = [ + "bitflags 2.5.0", + "cairo-sys-rs 0.18.2", + "glib 0.18.5", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-rs" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.2", - "cairo-sys-rs", - "glib", + "bitflags 2.5.0", + "cairo-sys-rs 0.19.2", + "glib 0.19.4", "libc", "thiserror", ] [[package]] name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys 0.18.1", + "libc", + "system-deps", +] + +[[package]] +name = "cairo-sys-rs" version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "system-deps", ] [[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] name = "cc" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" [[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", @@ -267,6 +372,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] name = "clap" version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -282,6 +397,36 @@ dependencies = [ ] [[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] name = "concurrent-queue" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -291,6 +436,12 @@ dependencies = [ ] [[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] name = "cookie" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -303,9 +454,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "time", "version_check", @@ -345,12 +496,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.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-utils" version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[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 = "darling" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -369,7 +581,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", ] @@ -381,7 +593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -408,12 +620,6 @@ dependencies = [ ] [[package]] -name = "dbus-dummy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d24c4c449e488b022f58a19817ffcedc637d67237076068da883e0fc8f7159" - -[[package]] name = "dbus-tree" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -423,23 +629,23 @@ dependencies = [ ] [[package]] -name = "deranged" -version = "0.3.11" +name = "der" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ - "powerfmt", + "const-oid", + "pem-rfc7468", + "zeroize", ] [[package]] -name = "derivative" -version = "2.2.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 1.0.109", + "powerfmt", ] [[package]] @@ -454,10 +660,62 @@ dependencies = [ ] [[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "const-oid", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-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" +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", +] + +[[package]] name = "documented" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f2016be31b2ee8ca5950d0b985e53d2802bbe646634e41cdf70f668fc66049" +checksum = "21cd1d2800b9a2b71d4311a38fcda9eebc9313bbd86730880147eba1e29599e0" dependencies = [ "documented-derive", "phf", @@ -466,19 +724,48 @@ dependencies = [ [[package]] name = "documented-derive" -version = "0.3.0" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48583206f0a72d5fbfcb5dd8ab56ec878a6594fbcb1219d5b65b502b960c7cdb" +dependencies = [ + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "ecb" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83095afc77f3f21d50be46d608d0a1cfa463cc97e4f3aedab871d6e0baf91870" +checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7" dependencies = [ - "quote 1.0.35", - "syn 2.0.50", + "cipher", +] + +[[package]] +name = "embed-resource" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml", + "vswhom", + "winreg", ] [[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", ] @@ -490,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -512,9 +799,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.1.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -523,9 +810,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ "event-listener", "pin-project-lite", @@ -533,9 +820,18 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +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" @@ -548,6 +844,16 @@ dependencies = [ ] [[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 = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -559,7 +865,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -569,6 +896,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -594,7 +927,7 @@ checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" dependencies = [ "darling", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -643,8 +976,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -674,67 +1007,160 @@ dependencies = [ ] [[package]] +name = "gdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" +dependencies = [ + "cairo-rs 0.18.5", + "gdk-pixbuf 0.18.5", + "gdk-sys", + "gio 0.18.4", + "glib 0.18.5", + "libc", + "pango 0.18.3", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" +dependencies = [ + "gdk-pixbuf-sys 0.18.0", + "gio 0.18.4", + "glib 0.18.5", + "libc", + "once_cell", +] + +[[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", + "gdk-pixbuf-sys 0.19.0", + "gio 0.19.4", + "glib 0.19.4", "libc", ] [[package]] name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", +] + +[[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", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" +dependencies = [ + "cairo-sys-rs 0.18.2", + "gdk-pixbuf-sys 0.18.0", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", + "pango-sys 0.18.0", + "pkg-config", "system-deps", ] [[package]] name = "gdk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ - "cairo-rs", - "gdk-pixbuf", + "cairo-rs 0.19.4", + "gdk-pixbuf 0.19.2", "gdk4-sys", - "gio", - "glib", + "gio 0.19.4", + "glib 0.19.4", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gdk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "cairo-sys-rs 0.19.2", + "gdk-pixbuf-sys 0.19.0", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", - "pango-sys", + "pango-sys 0.19.0", "pkg-config", "system-deps", ] [[package]] +name = "gdk4-win32" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" +dependencies = [ + "gdk4", + "gdk4-win32-sys", + "gio 0.19.4", + "glib 0.19.4", + "libc", +] + +[[package]] +name = "gdk4-win32-sys" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" +dependencies = [ + "gdk4-sys", + "glib-sys 0.19.0", + "libc", + "system-deps", +] + +[[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.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -769,16 +1195,35 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ "futures-channel", "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", + "gio-sys 0.18.1", + "glib 0.18.5", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.19.0", + "glib 0.19.4", "libc", "pin-project-lite", "smallvec", @@ -787,12 +1232,25 @@ dependencies = [ [[package]] name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", + "winapi", +] + +[[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", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "system-deps", "windows-sys 0.52.0", @@ -800,20 +1258,43 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" +dependencies = [ + "bitflags 2.5.0", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys 0.18.1", + "glib-macros 0.18.5", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.0", + "glib-macros 0.19.4", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "memchr", "smallvec", @@ -822,15 +1303,39 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 2.0.0", + "proc-macro-error", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "glib-macros" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" +dependencies = [ + "heck 0.5.0", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[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]] @@ -845,11 +1350,22 @@ dependencies = [ [[package]] name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys 0.18.1", + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "system-deps", ] @@ -860,7 +1376,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ - "glib", + "glib 0.19.4", "graphene-sys", "libc", ] @@ -871,7 +1387,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ - "glib-sys", + "glib-sys 0.19.0", "libc", "pkg-config", "system-deps", @@ -879,94 +1395,146 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ - "cairo-rs", + "cairo-rs 0.19.4", "gdk4", - "glib", + "glib 0.19.4", "graphene-rs", "gsk4-sys", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gsk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ - "cairo-sys-rs", + "cairo-sys-rs 0.19.2", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "graphene-sys", "libc", - "pango-sys", + "pango-sys 0.19.0", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" +dependencies = [ + "atk", + "cairo-rs 0.18.5", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf 0.18.5", + "gio 0.18.4", + "glib 0.18.5", + "gtk-sys", + "gtk3-macros", + "libc", + "pango 0.18.3", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" +dependencies = [ + "atk-sys", + "cairo-sys-rs 0.18.2", + "gdk-pixbuf-sys 0.18.0", + "gdk-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "pango-sys 0.18.0", "system-deps", ] [[package]] +name = "gtk3-macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] name = "gtk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ - "cairo-rs", + "cairo-rs 0.19.4", "field-offset", "futures-channel", - "gdk-pixbuf", + "gdk-pixbuf 0.19.2", "gdk4", - "gio", - "glib", + "gio 0.19.4", + "glib 0.19.4", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "pango", + "pango 0.19.3", ] [[package]] name = "gtk4-macros" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", + "cairo-sys-rs 0.19.2", + "gdk-pixbuf-sys 0.19.0", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.19.0", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "graphene-sys", "gsk4-sys", "libc", - "pango-sys", + "pango-sys 0.19.0", "system-deps", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ "bytes", "fnv", @@ -987,7 +1555,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] @@ -1012,6 +1580,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" @@ -1022,9 +1596,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1034,9 +1608,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1045,12 +1619,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -1061,46 +1647,59 @@ 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.28" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1131,15 +1730,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] name = "ipnet" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1147,20 +1756,31 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[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 = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] +name = "keyboard-types" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +dependencies = [ + "bitflags 2.5.0", + "serde", + "unicode-segmentation", +] + +[[package]] name = "ksni" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1173,16 +1793,37 @@ dependencies = [ ] [[package]] -name = "ksni-dummy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705305cfe9604f3081b8c33e03c351da01eedd7dff89a86f7fbc486f025a2f37" - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin", +] + +[[package]] +name = "libappindicator" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" +dependencies = [ + "glib 0.18.5", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] [[package]] name = "libc" @@ -1201,6 +1842,22 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] name = "libmimalloc-sys" version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1211,6 +1868,35 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "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", +] + +[[package]] name = "linux-raw-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1241,15 +1927,15 @@ 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 = "lrc-nom" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7b624e31b9613023e400fb5dd998facc31b593e90c8115d67d561d9bd6a671" +checksum = "a0fb729227bcfd7c7cf247c37a932ac168b94759c052f046b9aad4ba5f584f70" dependencies = [ "nom", "rust_decimal", @@ -1283,15 +1969,15 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[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", ] @@ -1324,13 +2010,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", + "simd-adler32", ] [[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", @@ -1351,6 +2038,25 @@ dependencies = [ ] [[package]] +name = "muda" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" +dependencies = [ + "cocoa", + "crossbeam-channel", + "dpi", + "gtk", + "keyboard-types", + "libxdo", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] name = "native-tls" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1371,16 +2077,20 @@ dependencies = [ [[package]] name = "ncmapi" version = "0.1.13" -source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=51b4d121#51b4d121235823e8040feb3a9c9052da0559fe75" +source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=6095abf7#6095abf7e54eedbb716676d311e0741b4ac2482e" dependencies = [ + "aes", "base64", - "cookie 0.18.0", + "cbc", + "cookie 0.18.1", + "ecb", "hex", - "openssl", + "md5", "phf", "rand", "regex", "reqwest", + "rsa", "serde", "serde_json", "serde_repr", @@ -1409,18 +2119,56 @@ dependencies = [ ] [[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[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.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +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]] @@ -1429,7 +2177,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.6", + "hermit-abi 0.3.9", "libc", ] @@ -1478,14 +2226,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] +name = "opencc-rust" +version = "1.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93236c9c3fb3e36c0cf4467731aabf338fd4831d4fad072a47cb2d4757e47303" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] name = "openssl" version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -1499,8 +2257,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -1510,28 +2268,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "openssl-src" -version = "300.2.3+3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" -dependencies = [ - "cc", -] - -[[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] [[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1539,14 +2293,39 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.2" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio 0.18.4", + "glib 0.18.5", + "libc", + "once_cell", + "pango-sys 0.18.0", +] + +[[package]] +name = "pango" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ - "gio", - "glib", + "gio 0.19.4", + "glib 0.19.4", "libc", - "pango-sys", + "pango-sys 0.19.0", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", + "libc", + "system-deps", ] [[package]] @@ -1555,8 +2334,8 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.19.0", + "gobject-sys 0.19.0", "libc", "system-deps", ] @@ -1591,6 +2370,15 @@ 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" @@ -1625,8 +2413,8 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -1639,10 +2427,30 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[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" @@ -1651,12 +2459,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] name = "pkg-config" version = "0.3.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 = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1670,6 +2512,25 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[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" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -1685,7 +2546,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -1697,15 +2558,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1732,7 +2593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -1764,9 +2625,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[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", ] @@ -1817,15 +2678,26 @@ dependencies = [ ] [[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] name = "regex" -version = "1.10.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.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1839,13 +2711,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -1856,9 +2728,9 @@ 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 = "rend" @@ -1871,9 +2743,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" dependencies = [ "base64", "bytes", @@ -1885,8 +2757,10 @@ dependencies = [ "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -1936,15 +2810,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[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 = "rust_decimal" -version = "1.34.3" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "borsh", @@ -1962,7 +2856,7 @@ version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "rust_decimal", ] @@ -1983,11 +2877,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1996,18 +2890,25 @@ 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", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + +[[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -2038,9 +2939,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2051,9 +2952,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -2081,15 +2982,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -2098,13 +2999,13 @@ 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 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2147,6 +3048,22 @@ dependencies = [ ] [[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2169,18 +3086,18 @@ 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" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2194,6 +3111,22 @@ dependencies = [ ] [[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2207,27 +3140,33 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck 0.4.1", "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "rustversion", - "syn 2.0.50", + "syn 2.0.58", ] [[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] name = "syn" version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2245,18 +3184,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.50" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", - "quote 1.0.35", + "quote 1.0.36", "unicode-ident", ] @@ -2268,8 +3207,8 @@ checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2310,12 +3249,12 @@ 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 0.4.1", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -2335,15 +3274,15 @@ 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 = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -2362,22 +3301,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2392,9 +3331,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2413,9 +3352,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2438,9 +3377,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2462,8 +3401,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2492,14 +3431,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -2513,6 +3452,28 @@ dependencies = [ [[package]] name = "toml_edit" +version = "0.19.15" +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.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +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" @@ -2524,18 +3485,40 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.2", + "winnow 0.6.6", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", ] [[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] name = "tower-service" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2547,6 +3530,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2559,8 +3543,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", ] [[package]] @@ -2614,12 +3598,37 @@ dependencies = [ ] [[package]] +name = "tray-icon" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97ec55956c54569e74209ae9d29a7a79193b252d17a6ac28bcffd4c11a384ad" +dependencies = [ + "cocoa", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "libappindicator", + "muda", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.52.0", +] + +[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] name = "unicode-bidi" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2671,9 +3680,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "valuable" @@ -2695,9 +3704,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[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" @@ -2706,6 +3715,26 @@ 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 = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2722,9 +3751,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2732,24 +3761,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2759,56 +3788,56 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", - "quote 1.0.35", - "syn 2.0.50", + "quote 1.0.36", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "waylyrics" -version = "0.2.12" +version = "0.2.19" dependencies = [ + "ahash 0.8.11", "anyhow", "async-channel", "async-trait", "dbus", - "dbus-dummy", - "derivative", + "directories", "documented", + "gdk4-win32", "gettext-rs", - "glib-macros", + "glib-macros 0.19.4", "gtk4", "ksni", - "ksni-dummy", "lrc-nom", "md5", "mimalloc", "mpris", "ncmapi", "once_cell", - "openssl", + "opencc-rust", "qqmusic-rs", "regex", "reqwest", @@ -2821,19 +3850,21 @@ dependencies = [ "thiserror", "tokio", "toml", - "toml_edit 0.22.6", + "toml_edit 0.22.9", "tracing", "tracing-journald", "tracing-subscriber", + "tray-icon", "url", - "xdg", + "windows", + "windows_exe_info", ] [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2862,6 +3893,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" +dependencies = [ + "windows-core", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "windows-result" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2876,7 +3960,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]] @@ -2896,17 +3980,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]] @@ -2917,9 +4002,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" @@ -2929,9 +4014,18 @@ 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_exe_info" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff" +dependencies = [ + "embed-resource", +] [[package]] name = "windows_i686_gnu" @@ -2941,9 +4035,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" @@ -2953,9 +4053,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" @@ -2965,9 +4065,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" @@ -2977,9 +4077,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" @@ -2989,9 +4089,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -3004,18 +4104,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" 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", @@ -3031,13 +4131,43 @@ dependencies = [ ] [[package]] -name = "xdg" -version = "2.5.2" +name = "x11" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[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 1.0.36", + "syn 2.0.58", +] + +[[package]] +name = "zeroize" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 9f55645a56bbc..fa01a22eb8321 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.2.12"; + version = "0.2.19"; src = fetchFromGitHub { owner = "poly000"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-sUhFT3Vq/IjbMir7/AVCU8FyfmoNiZsn2zkqdJkOMFo="; + hash = "sha256-y8FBZ/BvCj7CBfQlNE1Ay2nuP41WC14dfTeOJhTbHYs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ncmapi-0.1.13" = "sha256-NxgF1TV+3hK5oE/DfJnWyc+XmPX3U1UeD+xTkcvDzIA="; + "ncmapi-0.1.13" = "sha256-gwFMmMzQywlsQC2GljgLwXoP2Cca0r24iEDmV0k/xG0="; "qqmusic-rs-0.1.0" = "sha256-woLsO0n+m3EBUI+PRLio7iLp0UPQSliWK0djCSZEaZc="; }; }; @@ -51,6 +51,14 @@ rustPlatform.buildRustPackage rec { # Install icons install -d $out/share/icons cp -vr res/icons/hicolor $out/share/icons/hicolor + # Install translations + pushd locales + for po in $(find . -type f -name '*.po') + do + install -d $(dirname "$out/share/locale/$po") + msgfmt -o $out/share/locale/''${po%.po}.mo $po + done + popd ''; meta = with lib; { diff --git a/pkgs/applications/audio/yesplaymusic/default.nix b/pkgs/applications/audio/yesplaymusic/default.nix deleted file mode 100644 index a7f81dcf4c40b..0000000000000 --- a/pkgs/applications/audio/yesplaymusic/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, undmg -, dpkg -, autoPatchelfHook -, wrapGAppsHook -, makeWrapper -, alsa-lib -, at-spi2-atk -, cups -, nspr -, nss -, mesa # for libgbm -, xorg -, xdg-utils -, libdrm -, libnotify -, libsecret -, libuuid -, gtk3 -, systemd -}: -let - pname = "yesplaymusic"; - version = "0.4.7"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; - hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng="; - }; - aarch64-linux = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; - hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg="; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; - hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM="; - }; - aarch64-darwin = fetchurl { - url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; - hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8="; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - libraries = [ - alsa-lib - at-spi2-atk - cups - nspr - nss - mesa - xorg.libxshmfence - xorg.libXScrnSaver - xorg.libXtst - xdg-utils - libdrm - libnotify - libsecret - libuuid - gtk3 - ]; - - meta = with lib; { - description = "A good-looking third-party netease cloud music player"; - mainProgram = "yesplaymusic"; - homepage = "https://github.com/qier222/YesPlayMusic/"; - license = licenses.mit; - maintainers = with maintainers; [ ChaosAttractor ]; - platforms = builtins.attrNames srcs; - }; -in -if stdenv.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; -} -else stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - makeWrapper - ]; - - buildInputs = libraries; - - runtimeDependencies = [ - (lib.getLib systemd) - ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r opt $out/opt - cp -r usr/share $out/share - substituteInPlace $out/share/applications/yesplaymusic.desktop \ - --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" - makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ - --argv0 "yesplaymusic" \ - --add-flags "$out/opt/YesPlayMusic/resources/app.asar" - - runHook postInstall - ''; -} diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 7f6b7865054f1..c56e2ba4c48fc 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.1"; + version = "3.3.5"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-N6TzDTKvMyasksE0qcEGKeNjGAD08OzxpmpoQ11/ZW4="; + hash = "sha256-JOmcfe7xrKRaxJwj2No3e99HBYbX+ROTjHl5Frc2P9Q="; }; pnpmDeps = stdenvNoCC.mkDerivation { @@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-V6CSawxBWFbXmAPbck0xCXqRlANpqFAoqSAB4Duf8qM="; - aarch64-linux = "sha256-cqBn35soV14CmobKt0napRELio4HKKA8Iw3QSWTxzP8="; - x86_64-darwin = "sha256-DY9T1N8Hxr57/XisYT+u2+hQvYMIiyQ3UHeTuA6BhSY="; - aarch64-darwin = "sha256-3Zk0SyhVKaz5QdO69/xzWFZj9ueJS6GLWhfW7odWvHc="; + x86_64-linux = "sha256-K2yJdoi+bJpz0Xf2MHlFzQXbP+H3uVE2hYfkzoB7vBE="; + aarch64-linux = "sha256-ZiA6XKPnkoAl9m2vEJth2wyDxj61Efye4cUk+76znnM="; + x86_64-darwin = "sha256-wh5Y47c5qD2PctROP9AWqLDs7H5S2/8X0zxkSMkr1xQ="; + aarch64-darwin = "sha256-e2h4bLVnSEtZcHERsfkNmawgxQHQXxgXrNlFKB+IRTw="; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/applications/audio/ytmdesktop/default.nix b/pkgs/applications/audio/ytmdesktop/default.nix deleted file mode 100644 index 534bee41a9830..0000000000000 --- a/pkgs/applications/audio/ytmdesktop/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, fetchurl, appimageTools, }: - -let - pname = "ytmdesktop"; - version = "1.13.0"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${version}/YouTube-Music-Desktop-App-${version}.AppImage"; - sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v"; - }; - - appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 rec { - inherit name src; - - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - - install -m 444 \ - -D ${appimageContents}/youtube-music-desktop-app.desktop \ - -t $out/share/applications - substituteInPlace \ - $out/share/applications/youtube-music-desktop-app.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "A Desktop App for YouTube Music"; - homepage = "https://ytmdesktop.app/"; - license = licenses.cc0; - platforms = platforms.linux; - maintainers = [ maintainers.lgcl ]; - mainProgram = "ytmdesktop"; - }; -} diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 254e0e5b746d0..663c159d5d9b0 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -64,7 +64,7 @@ , sratom , texi2html , vamp-plugin-sdk -, wrapGAppsHook +, wrapGAppsHook4 , xdg-utils , xxHash , zix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { python3.pkgs.sphinx sassc texi2html - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 4bd8546e8ad12..1eb0909bc09bf 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.10.5"; + version = "0.10.7"; pyproject = true; src = fetchFromGitHub { owner = "ep1cman"; repo = "unifi-protect-backup"; rev = "refs/tags/v${version}"; - hash = "sha256-la/YLodfAnVuM5On6u4dyDDUvaCotmDZtHdxgNnD31A="; + hash = "sha256-Ypx9drM9Ks3RR75lz2COflr6GF6Bm9D+GwJWPGwuq/c="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index ed5f59e2c41ce..3e6158f69ab51 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "An easy to setup Open Source client/server backup system"; longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time"; homepage = "https://www.urbackup.org/index.html"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.mgttlinger ]; }; diff --git a/pkgs/applications/blockchains/aperture/default.nix b/pkgs/applications/blockchains/aperture/default.nix index c453d48c567ac..90591889df5d7 100644 --- a/pkgs/applications/blockchains/aperture/default.nix +++ b/pkgs/applications/blockchains/aperture/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aperture"; - version = "0.2-beta"; + version = "0.3-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "aperture"; rev = "v${version}"; - hash = "sha256-l1fpjCAg+1PGNotKrjFLoYOMEzRNXC1mfdjRPfE0DsY="; + hash = "sha256-PsmaNJxWkXiFDA7IGhT+Kx1GUvv23c8L8Jz21/b48oo="; }; - vendorHash = "sha256-tWFFmRSDUZXijAUTgR8k4EERHwIEBOyZZZ9BGXso/tU="; + vendorHash = "sha256-rrDLdE7c6ykhdqOfRpuxyRO4xqYp3LZvovAppzy1wVw="; subPackages = [ "cmd/aperture" ]; @@ -22,7 +22,7 @@ buildGoModule rec { description = "L402 (Lightning HTTP 402) Reverse Proxy"; homepage = "https://github.com/lightninglabs/aperture"; license = licenses.mit; - maintainers = with maintainers; [ sputn1ck ]; + maintainers = with maintainers; [ sputn1ck HannahMR ]; mainProgram = "aperture"; }; } diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 31c044f39c611..d4a3bdf0a444b 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -38,11 +38,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.14"; + version = "1.9.15"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0xbq94qbp59523xjp80bly38aisfwkfi0y9hmyhf8xlw084b82kz"; + sha256 = "0bz4yzfrzn9rwsmwwnsqdgxsqd42dyiz3vxi53qxj36h49nh8lzg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 126b6ef742291..427576b688ebc 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.28.11"; + version = "0.29.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-JOAEaz9b89qIpHOJ+aHMu8RVpEvzuVtFv8plUMKcmlM="; + hash = "sha256-QEuOMl1sbVdB2nRwBO/2adqj/NIQGbwrBqML39fymM0="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index f31fea1527105..0a2ea1937ad98 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "26.0"; + version = "27.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1"; + sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index 16e89b1e9daf3..7c5f803a968cc 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -6,15 +6,15 @@ , unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "btcdeb"; - version = "0.3.20-unstable-2024-02-06"; + version = "0.3.20-unstable-2024-03-26"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "btcdeb"; - rev = "b9288fc3371eb1d9be0cae2549be25de66659be8"; - hash = "sha256-IieLNMA3m6g2Kn7g3iewmUL9c+meMR4hrrwVYqNZoh8="; + rev = "675b7820f0eec8a76f68ade7ea35974a561d49dd"; + hash = "sha256-J9E0edRbFONMut1/ZFaUqgWAtEUifc+pmGypeUQ0m4c="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index a42d94e1f89c5..15d0335736017 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.12.5"; + version = "1.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-qlqwIVk8NzfFZlzShfm3nTZWovObWLIKiNGAOCN8i7Y="; + sha256 = "sha256-p0GNwwbhsgChlSlPVD/RHhzWF/1URdYp/iYQmJxORU8="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 0e5986de9739b..2ae9af5a08878 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,18 +8,18 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.5.3"; sha256 = "0nn6z1gjkkfy46w32pc5dvp4z5gjnwa9bn7xjkxgh7575m467jpp"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.6.0"; sha256 = "0xcqf7jz5rsi6nawcjfdbbdjlnqbx8xfzw8sn3a9ks8xjqv37krn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.5.1"; sha256 = "1sb6qhm15d6qqyx9v5g7csvp8phhs6k2py5wmfmbpnjydaydf76g"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.5.1"; sha256 = "13slknvqslxn8sp4dcwgbrnigrd9di84h9hribpls79kzw76gfpy"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.6.0"; sha256 = "1bsmic9i1p2ya5hv1mscv46fxh6ibczfj1srylzwcpgs0mypy5y3"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.5.1"; sha256 = "1jy5k0nd2b10p3gyv8qm3nb31chkpcssrb9sjw2dqbac757nv154"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.5.2"; sha256 = "1wmj66my2cg9dbz4bf8vrkxpkpl4wfqaxxzqxgs830vdk8h7pp50"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.5.2"; sha256 = "0g2jv712lb3arlpf6j8p0ccq62gz1bjipb9ndzhdk7mwhaznkrwl"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.5.2"; sha256 = "1yfs2ghh7xw4c98hfm3k8sdkij8qxwnfnb8fjw896jvj2jd3p3sr"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.5.4"; sha256 = "0jqxy60msq9rl04lmqyiz9f02mjywypfh3apr9vcbyv2q47maxnd"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.5.2"; sha256 = "09i663w6i93675bxrq5x6l26kr60mafwfr6ny92xrppj8rmd2lzx"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) - (fetchNuGet { pname = "BTCPayServer.NTag424"; version = "1.0.20"; sha256 = "19nzikcg7vygpad83lcaw5jvkrp4pgvggnziwkmi95l8k38gkj5q"; }) + (fetchNuGet { pname = "BTCPayServer.NTag424"; version = "1.0.22"; sha256 = "1gy81kqd745p2sak7yj5phn25k8blwwjzi39s5ikpwyqg3b0arsw"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) (fetchNuGet { pname = "Dapper"; version = "2.1.28"; sha256 = "15vpa9k11rr1mh5vb6hdchy8hqa03lqs83w19s3kxzh1089yl9m8"; }) (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.4"; sha256 = "1hkdls4wjrxq6df1zq9saa6hn5hynalq3gxb486w59j7i9f3g7d8"; }) @@ -36,7 +36,7 @@ (fetchNuGet { pname = "Google.Apis.Core"; version = "1.38.0"; sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; }) (fetchNuGet { pname = "Google.Apis.Storage.v1"; version = "1.38.0.1470"; sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; }) (fetchNuGet { pname = "Google.Cloud.Storage.V1"; version = "2.3.0"; sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; }) - (fetchNuGet { pname = "HtmlSanitizer"; version = "8.0.723"; sha256 = "1x621v4ypgd1zrmq7zd7j9wcrc30f6rm9qh0i1sm4yfqd983yf4g"; }) + (fetchNuGet { pname = "HtmlSanitizer"; version = "8.0.838"; sha256 = "1k05ld36872lzbhlby9m1vf9y7chlijbflbk2pzcni57b9rp2qrg"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) @@ -251,6 +251,7 @@ (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; }) (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index cf8279e78c7b8..cab5a9c42d7b0 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.02.1"; + version = "24.02.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-cz4rQUEaWILZMxmIP4V15pWf4zow5PDeWJzn5FEaUSs="; + sha256 = "sha256-KQS/4VmUxJkNpvPcxL5Up9f25leiPzvi2AiKuzRQmDo="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index fa604e9aac938..6fe4afa5b5841 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -15,6 +15,13 @@ buildGoModule rec { subPackages = [ "." ]; + checkFlags = [ + # Test fails with: + # 'x509_test.go:201: server did not report bad certificate error; + # instead errored with [...] tls: unknown certificate authority (*url.Error)' + "-skip=^TestUntrustedClientCert$" + ]; + meta = { homepage = "https://decred.org"; description = "A secure Decred wallet daemon written in Go (golang)"; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 73acf782e8139..b3ff8ccce2c24 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.20"; + version = "5.0.21"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-wC3KnuKHsUw1jt7EXVAgPhB6Sk8630sVaM3yn6CGPqs="; + sha256 = "sha256-WtBsChSHnYbRBojxRUGdMnXlG+45hp4ZSd8GLx5n/88="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index ae77b64c7b04a..a0e11018f828d 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.55.1"; + version = "2.59.3"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-ttBJIx2QR3H5JFyquoGwZpWwT10r7X7GnGE4uEzuRZA="; + hash = "sha256-pkcT9KFX4rz6WXUm9cG+6x9k+jGmLPGgl/4VnS7TNVE="; fetchSubmodules = true; }; - vendorHash = "sha256-QLuWxec1gwMnVo0Zw8z4Ef8vzxc4xFpLL/TT986Sljo="; + vendorHash = "sha256-B3xbCI0szSAo9ULHDiqoTTR8tvgZUry7spDGuldu0lU="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: @@ -34,6 +34,14 @@ buildGoModule { "cmd/rlpdump" ]; + # Matches the tags to upstream's release build configuration + # https://github.com/ledgerwatch/erigon/blob/0c0dbe5f3a81cf8f16da8e4838312ab80ebe5302/.goreleaser.yml + # + # Enabling silkworm also breaks the build as it requires dynamically linked libraries. + # If we need it in the future, we should consider packaging silkworm and silkworm-go + # as depenedencies explicitly. + tags = "-tags=nosqlite,noboltdb,nosilkworm"; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 60189088b2019..d1e389dc61407 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "24.11.5"; + version = "24.13.3"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-sh6Ym+Dm5UIEiESIu1cuY8XSsnJcENCzW7b4S562ax8="; + sha256 = "sha256-hhPHWo+nQXgluB6qn57wndX1eslLv3lLpdxm+COGMO8="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index 4a5bd601ced79..5774c082e2a34 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gridcoin-research"; - version = "5.4.7.0"; + version = "5.4.8.0"; src = fetchFromGitHub { owner = "gridcoin-community"; repo = "Gridcoin-Research"; rev = "${version}"; - sha256 = "sha256-wdXah7QnWohGAtC98exPSkhg5F3BaBOiFs6bklFxD7E="; + sha256 = "sha256-HZirzXkqM2aep+wq8k2UCFWHPtN0sBZXjamgt7RYPBo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/applications/blockchains/lndmanage/default.nix index 6a76ff9530c69..9eb40dd303f5d 100644 --- a/pkgs/applications/blockchains/lndmanage/default.nix +++ b/pkgs/applications/blockchains/lndmanage/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zEz1k98LIOWzqzZ+WNHBHY2hPwWE75bjP+quSdfI/8s="; + hash = "sha256-VUeGnk/DtNAyEYFESV6kXIRbKqUv4IcMnU3fo0NB4uQ="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 341e346b1c4d1..8f2f3b8501255 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -12,26 +12,26 @@ let owner = "monero-project"; repo = "supercop"; rev = "633500ad8c8759995049ccd022107d1fa8a1bbc9"; - sha256 = "26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; + hash = "sha256-26UmESotSWnQ21VbAYEappLpkEMyl0jiuCaezRYd/sE="; }; trezor-common = fetchFromGitHub { owner = "trezor"; repo = "trezor-common"; - rev = "bff7fdfe436c727982cc553bdfb29a9021b423b0"; - sha256 = "VNypeEz9AV0ts8X3vINwYMOgO8VpNmyUPC4iY3OOuZI="; + rev = "bc28c316d05bf1e9ebfe3d7df1ab25831d98d168"; + hash = "sha256-F1Hf1WwHqXMd/5OWrdkpomszACTozDuC7DQXW3p6248="; }; in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.3.2"; + version = "0.18.3.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-iVxy5SKBowTd8tY1L/MrXAu3r2S7bv67up3qWf0xJiw="; + hash = "sha256-1LkKIrud317BEE+713t5wiJV6FcDlJdj4ypXPR0bKTs="; }; patches = [ diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index a1ab9ff5889e5..d72cad5c53673 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.3.2"; + version = "0.18.3.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-7/pJcEWc7zujegBnlRDMOfYpVuUDMGsQO805nYgN5PY="; + hash = "sha256-6qadBm4bPui11OVY1tLFcHsfswXWBFiJvutIsF6EfX8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 6a4b164e5f1c4..5f8c0110402e3 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-yhOPv8J1unDx61xPc8ktQbIfkp00PPXRlOgdGo2QkB4="; + sha256 = "sha256-zfL+VoDfICUtw02KeRghaq3XPOa/YnSh8orhqmo3Auo="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index 97879b0c4e394..cdf73d5de09ad 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -46,7 +46,7 @@ (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.0"; sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) - (fetchNuGet { pname = "Npgsql"; version = "8.0.1"; sha256 = "01dqlqpwr450vfs7r113k1glrnpnr2fgc04x5ni6bj0k6aahhl7v"; }) + (fetchNuGet { pname = "Npgsql"; version = "8.0.2"; sha256 = "0w1hm3bjh1vfnkzflp1x8bd4d723mpr4y6gb6ga79v5kkf09cmm2"; }) (fetchNuGet { pname = "RabbitMQ.Client"; version = "5.1.2"; sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index f65ff172ab05a..7e368b3e686a7 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.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-ru6/PDgsQOpOjKSolk3US6dV/NMH/lWEuJf5lmuR4SI="; + hash = "sha256-KKCVjGBQeO5K6wq3GV3f7qaGY1uXNPI27w4DEC31pzU="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-BrlF8uwnD1hlrrpvc2JEsaPY4/+bGR1cXwjkkYANyiE="; + vendorHash = "sha256-pQhNXOYohBoV5QsBnNpNjFg+Vvk5jK1zvSKkolp4yiQ="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 7870081a63fe1..ad5d007915020 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -191,7 +191,7 @@ checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -202,11 +202,11 @@ checksum = "8a98ad1696a2e17f010ae8e43e9f2a1e930ed176a8e3ff77acfeff6dfb07b42c" dependencies = [ "const-hex", "dunce", - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "syn-solidity", "tiny-keccak", ] @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "approx" @@ -324,6 +324,20 @@ dependencies = [ [[package]] name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "aquamarine" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" @@ -333,7 +347,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -732,12 +746,6 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" @@ -833,6 +841,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", + "penpal-runtime", "rococo-runtime", "rococo-system-emulated-network", "sp-runtime", @@ -858,6 +867,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -954,6 +964,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", + "penpal-runtime", "polkadot-runtime-common", "sp-runtime", "staging-xcm", @@ -980,6 +991,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1218,7 +1230,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -1229,13 +1241,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -1320,7 +1332,7 @@ dependencies = [ "ark-std 0.4.0", "dleq_vrf", "fflonk", - "merlin 3.0.0", + "merlin", "rand_chacha 0.3.1", "rand_core 0.6.4", "ring 0.1.0", @@ -1383,7 +1395,7 @@ name = "binary-merkle-tree" version = "13.0.0" dependencies = [ "array-bytes 6.1.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "hash-db", "log", "sp-core", @@ -1417,7 +1429,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -1426,9 +1438,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ - "bitcoin_hashes", - "rand", - "rand_core 0.6.4", + "bitcoin_hashes 0.11.0", "serde", "unicode-normalization", ] @@ -1449,12 +1459,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + +[[package]] name = "bitcoin_hashes" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" [[package]] +name = "bitcoin_hashes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative", +] + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1547,18 +1573,6 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" @@ -1576,15 +1590,6 @@ dependencies = [ ] [[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] name = "blocking" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2007,6 +2012,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2145,6 +2151,7 @@ dependencies = [ "pallet-message-queue", "pallet-xcm", "parachains-common", + "parity-scale-codec", "rococo-westend-system-emulated-network", "sp-runtime", "staging-xcm", @@ -2177,6 +2184,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2610,12 +2618,12 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", - "clap_derive 4.5.0", + "clap_derive 4.5.3", ] [[package]] @@ -2629,9 +2637,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -2646,7 +2654,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", ] [[package]] @@ -2655,7 +2663,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -2664,14 +2672,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -2735,6 +2743,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2872,7 +2881,7 @@ dependencies = [ "ark-std 0.4.0", "fflonk", "getrandom_or_panic", - "merlin 3.0.0", + "merlin", "rand_chacha 0.3.1", ] @@ -2990,6 +2999,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3084,6 +3094,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3148,6 +3159,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3381,7 +3393,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.1", + "clap 4.5.3", "criterion-plot", "futures", "is-terminal", @@ -3513,16 +3525,6 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.5.0", -] - -[[package]] name = "ctr" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3544,7 +3546,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.7.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3810,6 +3812,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-io", "sp-runtime", "sp-transaction-pool", ] @@ -3874,6 +3877,7 @@ dependencies = [ "pallet-message-queue", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-common", "polkadot-runtime-parachains", "rand", "sc-client-api", @@ -3902,7 +3906,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4048,6 +4052,25 @@ dependencies = [ ] [[package]] +name = "cumulus-primitives-storage-weight-reclaim" +version = "1.0.0" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-test-runtime", + "docify", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "sp-trie", +] + +[[package]] name = "cumulus-primitives-timestamp" version = "0.7.0" dependencies = [ @@ -4067,7 +4090,6 @@ dependencies = [ "frame-support", "log", "pallet-asset-conversion", - "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -4147,6 +4169,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", + "polkadot-service", "sc-authority-discovery", "sc-client-api", "sc-network", @@ -4209,6 +4232,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", "cumulus-test-relay-sproof-builder", "cumulus-test-runtime", "cumulus-test-service", @@ -4253,6 +4277,7 @@ version = "0.1.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "frame-executive", "frame-support", "frame-system", @@ -4285,7 +4310,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.5.1", + "clap 4.5.3", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -4295,6 +4320,7 @@ dependencies = [ "cumulus-client-service", "cumulus-pallet-parachain-system", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", @@ -4305,7 +4331,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "jsonrpsee", - "pallet-im-online", "pallet-timestamp", "pallet-transaction-payment", "parachains-common", @@ -4359,19 +4384,6 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" -dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle 2.5.0", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" @@ -4408,7 +4420,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4448,7 +4460,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4465,7 +4477,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4569,6 +4581,17 @@ dependencies = [ ] [[package]] +name = "derive-syn-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4673,7 +4696,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4715,26 +4738,26 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.50", + "syn 2.0.53", "termcolor", "toml 0.8.8", "walkdir", @@ -4801,6 +4824,7 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", + "serdect", "signature", "spki", ] @@ -4867,9 +4891,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.5" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -4880,6 +4904,7 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", + "serdect", "subtle 2.5.0", "zeroize", ] @@ -4903,6 +4928,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "paste", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", "sc-consensus-grandpa", @@ -4936,7 +4962,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -4959,7 +4985,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4970,14 +4996,14 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] -name = "env_logger" -version = "0.8.4" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ "log", "regex", @@ -4985,15 +5011,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ - "atty", - "humantime", "log", "regex", - "termcolor", ] [[package]] @@ -5010,6 +5033,19 @@ dependencies = [ ] [[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] name = "environmental" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5023,9 +5059,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.30" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837c0466252947ada828b975e12daf82e18bb5444e4df87be6038d4469e2a3d2" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" dependencies = [ "serde", ] @@ -5160,7 +5196,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5174,12 +5210,6 @@ dependencies = [ ] [[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5288,7 +5318,7 @@ dependencies = [ "ark-poly", "ark-serialize 0.4.2", "ark-std 0.4.0", - "merlin 3.0.0", + "merlin", ] [[package]] @@ -5487,7 +5517,7 @@ dependencies = [ "Inflector", "array-bytes 6.1.0", "chrono", - "clap 4.5.1", + "clap 4.5.3", "comfy-table", "frame-benchmarking", "frame-support", @@ -5553,7 +5583,7 @@ dependencies = [ "quote", "scale-info", "sp-arithmetic", - "syn 2.0.50", + "syn 2.0.53", "trybuild", ] @@ -5579,7 +5609,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5596,6 +5626,7 @@ dependencies = [ name = "frame-executive" version = "28.0.0" dependencies = [ + "aquamarine 0.3.3", "array-bytes 6.1.0", "frame-support", "frame-system", @@ -5652,7 +5683,7 @@ dependencies = [ name = "frame-support" version = "28.0.0" dependencies = [ - "aquamarine", + "aquamarine 0.5.0", "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", @@ -5686,6 +5717,7 @@ dependencies = [ "sp-staking", "sp-state-machine", "sp-std 14.0.0", + "sp-timestamp", "sp-tracing 16.0.0", "sp-weights", "static_assertions", @@ -5698,7 +5730,7 @@ version = "23.0.0" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "expander 2.0.0", "frame-support-procedural-tools", "itertools 0.10.5", @@ -5708,7 +5740,7 @@ dependencies = [ "quote", "regex", "sp-crypto-hashing", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5719,7 +5751,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5728,7 +5760,7 @@ version = "11.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5961,7 +5993,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -6244,9 +6276,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.7" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" +checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" dependencies = [ "log", "pest", @@ -6316,6 +6348,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" @@ -6337,6 +6375,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hex-conservative" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2" + +[[package]] name = "hex-literal" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6363,16 +6407,6 @@ dependencies = [ [[package]] name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.0", - "digest 0.9.0", -] - -[[package]] -name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" @@ -6743,7 +6777,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.6", "widestring", "windows-sys 0.48.0", "winreg", @@ -6825,9 +6859,9 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] name = "jsonrpsee" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a95f7cc23d5fab0cdeeaf6bad8c8f5e7a3aa7f0d211957ea78232b327ab27b0" +checksum = "87f3ae45a64cfc0882934f963be9431b2a165d667f53140358181f262aca0702" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -6841,9 +6875,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1736cfa3845fd9f8f43751f2b8e0e83f7b6081e754502f7d63b6587692cc83" +checksum = "455fc882e56f58228df2aee36b88a1340eafd707c76af2fa68cf94b37d461131" dependencies = [ "futures-util", "http", @@ -6862,9 +6896,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82030d038658974732103e623ba2e0abec03bbbe175b39c0a2fafbada60c5868" +checksum = "b75568f4f9696e3a47426e1985b548e1a9fcb13372a5e320372acaf04aca30d1" dependencies = [ "anyhow", "async-lock 3.3.0", @@ -6888,9 +6922,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a06ef0de060005fddf772d54597bb6a8b0413da47dcffd304b0306147b9678" +checksum = "9e7a95e346f55df84fb167b7e06470e196e7d5b9488a21d69c5d9732043ba7ba" dependencies = [ "async-trait", "hyper", @@ -6908,22 +6942,22 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fc56131589f82e57805f7338b87023db4aafef813555708b159787e34ad6bc" +checksum = "30ca066e73dd70294aebc5c2675d8ffae43be944af027c857ce0d4c51785f014" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.53", ] [[package]] name = "jsonrpsee-server" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85be77fe5b2a94589e3164fb780017f7aff7d646b49278c0d0346af16975c8e" +checksum = "0e29c1bd1f9bba83c864977c73404e505f74f730fa0db89dd490ec174e36d7f0" dependencies = [ "futures-util", "http", @@ -6945,9 +6979,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a48fdc1202eafc51c63e00406575e59493284ace8b8b61aa16f3a6db5d64f1a" +checksum = "3467fd35feeee179f71ab294516bdf3a81139e7aeebdd860e46897c12e1a3368" dependencies = [ "anyhow", "beef", @@ -6958,9 +6992,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ce25d70a8e4d3cc574bbc3cad0137c326ad64b194793d5e7bbdd3fa4504181" +checksum = "68ca71e74983f624c0cb67828e480a981586074da8ad3a2f214c6a3f884edab9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -6971,14 +7005,15 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", "once_cell", + "serdect", "sha2 0.10.7", ] @@ -7058,6 +7093,7 @@ dependencies = [ "pallet-lottery", "pallet-membership", "pallet-message-queue", + "pallet-migrations", "pallet-mixnet", "pallet-mmr", "pallet-multisig", @@ -7561,7 +7597,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ - "heck", + "heck 0.4.1", "quote", "syn 1.0.109", ] @@ -7814,9 +7850,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" dependencies = [ "serde", "value-bag", @@ -7902,7 +7938,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7912,11 +7948,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7927,7 +7963,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7938,7 +7974,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -8058,18 +8094,6 @@ dependencies = [ [[package]] name = "merlin" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.5.1", - "zeroize", -] - -[[package]] -name = "merlin" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" @@ -8104,15 +8128,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "minimal-node" -version = "4.0.0-dev" +name = "minimal-template-node" +version = "0.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame", "futures", "futures-timer", "jsonrpsee", - "minimal-runtime", + "minimal-template-runtime", "sc-basic-authorship", "sc-cli", "sc-client-api", @@ -8139,12 +8163,12 @@ dependencies = [ ] [[package]] -name = "minimal-runtime" -version = "0.1.0" +name = "minimal-template-runtime" +version = "0.0.0" dependencies = [ "frame", - "frame-support", "pallet-balances", + "pallet-minimal-template", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", @@ -8166,9 +8190,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -8576,7 +8600,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes 6.1.0", - "clap 4.5.1", + "clap 4.5.3", "derive_more", "fs_extra", "futures", @@ -8653,60 +8677,16 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "generate-bags", "kitchensink-runtime", ] [[package]] -name = "node-template" -version = "4.0.0-dev" -dependencies = [ - "clap 4.5.1", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "futures", - "jsonrpsee", - "node-template-runtime", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc", - "sc-basic-authorship", - "sc-cli", - "sc-client-api", - "sc-consensus", - "sc-consensus-aura", - "sc-consensus-grandpa", - "sc-executor", - "sc-network", - "sc-offchain", - "sc-rpc-api", - "sc-service", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", - "serde_json", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus-aura", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-timestamp", - "substrate-build-script-utils", - "substrate-frame-rpc-system", - "try-runtime-cli", -] - -[[package]] name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "flate2", "fs_extra", "glob", @@ -8717,45 +8697,6 @@ dependencies = [ ] [[package]] -name = "node-template-runtime" -version = "4.0.0-dev" -dependencies = [ - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "pallet-aura", - "pallet-balances", - "pallet-grandpa", - "pallet-sudo", - "pallet-template", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", - "scale-info", - "serde_json", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-consensus-grandpa", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", -] - -[[package]] name = "node-testing" version = "3.0.0-dev" dependencies = [ @@ -9278,7 +9219,7 @@ dependencies = [ name = "pallet-bags-list" version = "27.0.0" dependencies = [ - "aquamarine", + "aquamarine 0.5.0", "docify", "frame-benchmarking", "frame-election-provider-support", @@ -9598,7 +9539,7 @@ dependencies = [ "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", - "env_logger 0.9.3", + "env_logger 0.11.3", "environmental", "frame-benchmarking", "frame-support", @@ -9616,6 +9557,7 @@ dependencies = [ "pallet-timestamp", "pallet-utility", "parity-scale-codec", + "paste", "pretty_assertions", "rand", "rand_pcg", @@ -9643,12 +9585,11 @@ dependencies = [ "anyhow", "frame-system", "parity-wasm", - "polkavm-linker 0.5.0", + "polkavm-linker", "sp-runtime", "tempfile", "toml 0.8.8", "twox-hash", - "wat", ] [[package]] @@ -9695,7 +9636,7 @@ version = "18.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -9705,7 +9646,7 @@ dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "paste", - "polkavm-derive 0.5.0", + "polkavm-derive", "scale-info", ] @@ -9845,7 +9786,7 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "sp-tracing 16.0.0", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] @@ -9943,6 +9884,26 @@ dependencies = [ ] [[package]] +name = "pallet-example-single-block-migrations" +version = "0.0.1" +dependencies = [ + "docify", + "frame-executive", + "frame-support", + "frame-system", + "frame-try-runtime", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "sp-version", +] + +[[package]] name = "pallet-example-split" version = "10.0.0" dependencies = [ @@ -9983,6 +9944,7 @@ dependencies = [ "pallet-example-frame-crate", "pallet-example-kitchensink", "pallet-example-offchain-worker", + "pallet-example-single-block-migrations", "pallet-example-split", "pallet-example-tasks", ] @@ -10189,6 +10151,39 @@ dependencies = [ ] [[package]] +name = "pallet-migrations" +version = "1.0.0" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "pretty_assertions", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "sp-tracing 16.0.0", + "sp-version", +] + +[[package]] +name = "pallet-minimal-template" +version = "0.0.0" +dependencies = [ + "frame", + "parity-scale-codec", + "scale-info", +] + +[[package]] name = "pallet-mixnet" version = "0.4.0" dependencies = [ @@ -10212,7 +10207,7 @@ name = "pallet-mmr" version = "27.0.0" dependencies = [ "array-bytes 6.1.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "frame-benchmarking", "frame-support", "frame-system", @@ -10489,14 +10484,13 @@ dependencies = [ [[package]] name = "pallet-parachain-template" -version = "0.7.0" +version = "0.0.0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "serde", "sp-core", "sp-io", "sp-runtime", @@ -10870,7 +10864,7 @@ dependencies = [ "proc-macro2", "quote", "sp-runtime", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -10951,7 +10945,7 @@ dependencies = [ [[package]] name = "pallet-template" -version = "4.0.0-dev" +version = "0.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10961,7 +10955,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -11201,6 +11194,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -11274,9 +11268,9 @@ dependencies = [ [[package]] name = "parachain-template-node" -version = "0.1.0" +version = "0.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -11332,7 +11326,7 @@ dependencies = [ [[package]] name = "parachain-template-runtime" -version = "0.7.0" +version = "0.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -11340,6 +11334,7 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -11449,6 +11444,19 @@ dependencies = [ ] [[package]] +name = "parity-bip39" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" +dependencies = [ + "bitcoin_hashes 0.13.0", + "rand", + "rand_core 0.6.4", + "serde", + "unicode-normalization", +] + +[[package]] name = "parity-bytes" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11603,19 +11611,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" [[package]] -name = "paste" -version = "1.0.14" +name = "password-hash" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle 2.5.0", +] [[package]] -name = "pbkdf2" -version = "0.8.0" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.0", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -11624,6 +11634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", + "password-hash", ] [[package]] @@ -11650,9 +11661,8 @@ dependencies = [ "frame-support", "parachains-common", "penpal-runtime", - "rococo-emulated-chain", "sp-core", - "westend-emulated-chain", + "staging-xcm", ] [[package]] @@ -11714,7 +11724,6 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", - "testnet-parachains-constants", ] [[package]] @@ -11763,6 +11772,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "enumflags2", "frame-benchmarking", @@ -11862,6 +11872,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "enumflags2", "frame-benchmarking", @@ -11951,7 +11962,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -11992,7 +12003,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -12090,7 +12101,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "itertools 0.10.5", @@ -12120,7 +12131,7 @@ dependencies = [ "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "log", @@ -12158,6 +12169,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-subsystem-bench", "rand", "sc-network", "schnellru", @@ -12175,7 +12187,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12189,6 +12201,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-subsystem-bench", "rand", "sc-network", "schnellru", @@ -12205,7 +12218,7 @@ name = "polkadot-cli" version = "7.0.0" dependencies = [ "cfg-if", - "clap 4.5.1", + "clap 4.5.3", "frame-benchmarking-cli", "futures", "log", @@ -12236,7 +12249,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12392,6 +12405,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", "sp-core", "sp-keyring", "sp-maybe-compressed-blob", @@ -12407,14 +12421,14 @@ dependencies = [ "async-trait", "bitvec", "derive_more", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "itertools 0.10.5", "kvdb", "kvdb-memorydb", "log", - "merlin 3.0.0", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-jaeger", @@ -12449,7 +12463,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "kvdb", @@ -12643,6 +12657,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", "sc-keystore", "sp-application-crypto", "sp-core", @@ -12666,6 +12681,8 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", + "schnellru", "sp-application-crypto", "sp-keystore", "thiserror", @@ -12888,7 +12905,7 @@ dependencies = [ "rand_chacha 0.3.1", "sc-authority-discovery", "sc-network", - "strum 0.24.1", + "strum 0.26.2", "thiserror", "tracing-gum", ] @@ -12980,7 +12997,7 @@ dependencies = [ "assert_matches", "async-trait", "derive_more", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-channel", @@ -13044,7 +13061,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "4.0.0" +version = "1.10.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13052,7 +13069,7 @@ dependencies = [ "async-trait", "bridge-hub-rococo-runtime", "bridge-hub-westend-runtime", - "clap 4.5.1", + "clap 4.5.3", "collectives-westend-runtime", "color-print", "contracts-rococo-runtime", @@ -13254,7 +13271,6 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-primitives-test-helpers", @@ -13362,11 +13378,32 @@ dependencies = [ "cumulus-pallet-parachain-system", "docify", "frame", + "frame-executive", + "frame-support", + "frame-system", "kitchensink-runtime", + "pallet-assets", "pallet-aura", + "pallet-authorship", + "pallet-babe", + "pallet-balances", + "pallet-broker", + "pallet-collective", "pallet-default-config-example", + "pallet-democracy", + "pallet-example-offchain-worker", + "pallet-example-single-block-migrations", "pallet-examples", + "pallet-multisig", + "pallet-nfts", + "pallet-preimage", + "pallet-proxy", + "pallet-referenda", + "pallet-scheduler", "pallet-timestamp", + "pallet-transaction-payment", + "pallet-uniques", + "pallet-utility", "parity-scale-codec", "sc-cli", "sc-client-db", @@ -13382,10 +13419,13 @@ dependencies = [ "scale-info", "simple-mermaid", "sp-api", + "sp-arithmetic", "sp-core", "sp-io", "sp-keyring", + "sp-offchain", "sp-runtime", + "sp-version", "staging-chain-spec-builder", "staging-node-cli", "staging-parachain-info", @@ -13400,7 +13440,8 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.9.3", + "bitvec", + "env_logger 0.11.3", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -13414,7 +13455,6 @@ dependencies = [ "log", "mmr-gadget", "pallet-babe", - "pallet-im-online", "pallet-staking", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -13511,12 +13551,14 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-xcm", "substrate-prometheus-endpoint", "tempfile", "thiserror", "tracing-gum", "westend-runtime", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -13571,11 +13613,11 @@ dependencies = [ "async-trait", "bincode", "bitvec", - "clap 4.5.1", + "clap 4.5.3", "clap-num", "color-eyre", "colored", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "hex", @@ -13613,8 +13655,9 @@ dependencies = [ "sc-keystore", "sc-network", "sc-service", - "schnorrkel 0.9.1", + "schnorrkel 0.11.4", "serde", + "serde_json", "serde_yaml", "sha1", "sp-application-crypto", @@ -13665,7 +13708,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.5.1", + "clap 4.5.3", "color-eyre", "futures", "futures-timer", @@ -13812,106 +13855,94 @@ dependencies = [ name = "polkadot-voter-bags" version = "7.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "generate-bags", "sp-io", "westend-runtime", ] [[package]] -name = "polkavm-common" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" - -[[package]] -name = "polkavm-common" -version = "0.8.0" +name = "polkavm" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" +checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94" +dependencies = [ + "libc", + "log", + "polkavm-assembler", + "polkavm-common", + "polkavm-linux-raw", +] [[package]] -name = "polkavm-derive" -version = "0.5.0" +name = "polkavm-assembler" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" +checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1" dependencies = [ - "polkavm-derive-impl 0.5.0", - "syn 2.0.50", + "log", ] [[package]] -name = "polkavm-derive" -version = "0.8.0" +name = "polkavm-common" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" +checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" dependencies = [ - "polkavm-derive-impl-macro", + "log", ] [[package]] -name = "polkavm-derive-impl" -version = "0.5.0" +name = "polkavm-derive" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" +checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" dependencies = [ - "polkavm-common 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.50", + "polkavm-derive-impl-macro", ] [[package]] name = "polkavm-derive-impl" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" +checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ - "polkavm-common 0.8.0", + "polkavm-common", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] name = "polkavm-derive-impl-macro" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" +checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ - "polkavm-derive-impl 0.8.0", - "syn 2.0.50", + "polkavm-derive-impl", + "syn 2.0.53", ] [[package]] name = "polkavm-linker" -version = "0.5.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a668bb33c7f0b5f4ca91adb1e1e71cf4930fef5e6909f46c2180d65cce37d0" +checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39" dependencies = [ "gimli 0.28.0", "hashbrown 0.14.3", "log", "object 0.32.2", - "polkavm-common 0.5.0", + "polkavm-common", "regalloc2 0.9.3", "rustc-demangle", ] [[package]] -name = "polkavm-linker" -version = "0.8.2" +name = "polkavm-linux-raw" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdec1451cb18261d5d01de82acc15305e417fb59588cdcb3127d3dcc9672b925" -dependencies = [ - "gimli 0.28.0", - "hashbrown 0.14.3", - "log", - "object 0.32.2", - "polkavm-common 0.8.0", - "regalloc2 0.9.3", - "rustc-demangle", -] +checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120" [[package]] name = "polling" @@ -14085,7 +14116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14176,7 +14207,7 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14248,7 +14279,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14310,7 +14341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -14348,7 +14379,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14691,7 +14722,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14779,7 +14810,7 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-system", "log", "pallet-bags-list-remote-tests", @@ -14862,7 +14893,7 @@ dependencies = [ "blake2 0.10.6", "common", "fflonk", - "merlin 3.0.0", + "merlin", ] [[package]] @@ -14956,6 +14987,7 @@ dependencies = [ "cumulus-ping", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -15026,7 +15058,6 @@ dependencies = [ "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -15097,6 +15128,7 @@ dependencies = [ "substrate-wasm-builder", "tiny-keccak", "tokio", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -15182,7 +15214,7 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.50", + "syn 2.0.53", "unicode-ident", ] @@ -15537,6 +15569,7 @@ dependencies = [ "futures-timer", "ip_network", "libp2p", + "linked_hash_set", "log", "multihash 0.18.1", "multihash-codetable", @@ -15636,7 +15669,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -15644,9 +15677,8 @@ name = "sc-cli" version = "0.36.0" dependencies = [ "array-bytes 6.1.0", - "bip39", "chrono", - "clap 4.5.1", + "clap 4.5.3", "fdlimit", "futures", "futures-timer", @@ -15654,6 +15686,7 @@ dependencies = [ "libp2p-identity", "log", "names", + "parity-bip39", "parity-scale-codec", "rand", "regex", @@ -16118,13 +16151,14 @@ dependencies = [ "array-bytes 6.1.0", "assert_matches", "criterion 0.4.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "num_cpus", "parity-scale-codec", "parking_lot 0.12.1", "paste", "regex", "sc-executor-common", + "sc-executor-polkavm", "sc-executor-wasmtime", "sc-runtime-test", "sc-tracing", @@ -16154,6 +16188,7 @@ dependencies = [ name = "sc-executor-common" version = "0.29.0" dependencies = [ + "polkavm", "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface 20.0.0", @@ -16162,6 +16197,16 @@ dependencies = [ ] [[package]] +name = "sc-executor-polkavm" +version = "0.29.0" +dependencies = [ + "log", + "polkavm", + "sc-executor-common", + "sp-wasm-interface 20.0.0", +] + +[[package]] name = "sc-executor-wasmtime" version = "0.29.0" dependencies = [ @@ -16542,7 +16587,7 @@ name = "sc-rpc" version = "29.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "jsonrpsee", "log", @@ -16608,7 +16653,6 @@ dependencies = [ "hyper", "jsonrpsee", "log", - "pin-project", "serde_json", "substrate-prometheus-endpoint", "tokio", @@ -16707,6 +16751,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "serde_json", "sp-api", @@ -16784,7 +16829,7 @@ dependencies = [ name = "sc-statement-store" version = "10.0.0" dependencies = [ - "env_logger 0.9.3", + "env_logger 0.11.3", "log", "parity-db", "parking_lot 0.12.1", @@ -16804,7 +16849,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.16.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "fs4", "log", "sp-core", @@ -16906,7 +16951,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -16976,9 +17021,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "788745a868b0e751750388f4e6546eb921ef714a4317fa6954f7cde114eb2eb7" dependencies = [ "bitvec", "cfg-if", @@ -16990,9 +17035,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "7dc2f4e8bc344b9fc3d5f74f72c2e55bfc38d28dc2ebc69c194a3df424e4d9ac" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -17046,22 +17091,6 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "curve25519-dalek 2.1.3", - "merlin 2.0.1", - "rand_core 0.5.1", - "sha2 0.8.2", - "subtle 2.5.0", - "zeroize", -] - -[[package]] -name = "schnorrkel" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" @@ -17069,7 +17098,7 @@ dependencies = [ "arrayref", "arrayvec 0.7.4", "curve25519-dalek-ng", - "merlin 3.0.0", + "merlin", "rand_core 0.6.4", "sha2 0.9.9", "subtle-ng", @@ -17087,7 +17116,7 @@ dependencies = [ "arrayvec 0.7.4", "curve25519-dalek 4.1.2", "getrandom_or_panic", - "merlin 3.0.0", + "merlin", "rand_core 0.6.4", "serde_bytes", "sha2 0.10.7", @@ -17133,6 +17162,7 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", + "serdect", "subtle 2.5.0", "zeroize", ] @@ -17323,7 +17353,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -17380,9 +17410,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap 2.2.3", "itoa", @@ -17392,6 +17422,16 @@ dependencies = [ ] [[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct", + "serde", +] + +[[package]] name = "serial_test" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17413,7 +17453,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -17453,18 +17493,6 @@ dependencies = [ [[package]] name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" @@ -17697,13 +17725,13 @@ dependencies = [ "hmac 0.12.1", "itertools 0.11.0", "libsecp256k1", - "merlin 3.0.0", + "merlin", "no-std-net", "nom", "num-bigint", "num-rational", "num-traits", - "pbkdf2 0.12.2", + "pbkdf2", "pin-project", "poly1305 0.8.0", "rand", @@ -17795,7 +17823,7 @@ dependencies = [ [[package]] name = "snowbridge-beacon-primitives" -version = "0.0.0" +version = "0.2.0" dependencies = [ "byte-slice-cast", "frame-support", @@ -17819,7 +17847,7 @@ dependencies = [ [[package]] name = "snowbridge-core" -version = "0.0.0" +version = "0.2.0" dependencies = [ "ethabi-decode", "frame-support", @@ -17842,7 +17870,7 @@ dependencies = [ [[package]] name = "snowbridge-ethereum" -version = "0.1.0" +version = "0.3.0" dependencies = [ "ethabi-decode", "ethbloom", @@ -17881,10 +17909,10 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-merkle-tree" -version = "0.1.1" +version = "0.3.0" dependencies = [ "array-bytes 4.2.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "hex", "hex-literal", "parity-scale-codec", @@ -17896,7 +17924,7 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-runtime-api" -version = "0.0.0" +version = "0.2.0" dependencies = [ "frame-support", "parity-scale-codec", @@ -17910,7 +17938,7 @@ dependencies = [ [[package]] name = "snowbridge-pallet-ethereum-client" -version = "0.0.0" +version = "0.2.0" dependencies = [ "bp-runtime", "byte-slice-cast", @@ -17956,7 +17984,7 @@ dependencies = [ [[package]] name = "snowbridge-pallet-inbound-queue" -version = "0.0.0" +version = "0.2.0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -17989,7 +18017,7 @@ dependencies = [ [[package]] name = "snowbridge-pallet-inbound-queue-fixtures" -version = "0.9.0" +version = "0.10.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -18003,7 +18031,7 @@ dependencies = [ [[package]] name = "snowbridge-pallet-outbound-queue" -version = "0.0.0" +version = "0.2.0" dependencies = [ "bridge-hub-common", "ethabi-decode", @@ -18028,7 +18056,7 @@ dependencies = [ [[package]] name = "snowbridge-pallet-system" -version = "0.0.0" +version = "0.2.0" dependencies = [ "ethabi-decode", "frame-benchmarking", @@ -18056,7 +18084,7 @@ dependencies = [ [[package]] name = "snowbridge-router-primitives" -version = "0.0.0" +version = "0.9.0" dependencies = [ "ethabi-decode", "frame-support", @@ -18079,7 +18107,7 @@ dependencies = [ [[package]] name = "snowbridge-runtime-common" -version = "0.0.0" +version = "0.2.0" dependencies = [ "frame-support", "frame-system", @@ -18095,7 +18123,7 @@ dependencies = [ [[package]] name = "snowbridge-runtime-test-common" -version = "0.0.0" +version = "0.2.0" dependencies = [ "assets-common", "bridge-hub-test-utils", @@ -18172,7 +18200,7 @@ dependencies = [ [[package]] name = "snowbridge-system-runtime-api" -version = "0.0.0" +version = "0.2.0" dependencies = [ "parity-scale-codec", "snowbridge-core", @@ -18194,12 +18222,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -18220,6 +18248,87 @@ dependencies = [ ] [[package]] +name = "solochain-template-node" +version = "0.0.0" +dependencies = [ + "clap 4.5.3", + "frame-benchmarking-cli", + "frame-system", + "futures", + "jsonrpsee", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "sc-basic-authorship", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-grandpa", + "sc-executor", + "sc-network", + "sc-offchain", + "sc-rpc-api", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde_json", + "solochain-template-runtime", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "try-runtime-cli", +] + +[[package]] +name = "solochain-template-runtime" +version = "0.0.0" +dependencies = [ + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-aura", + "pallet-balances", + "pallet-grandpa", + "pallet-sudo", + "pallet-template", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-genesis-builder", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] name = "sp-api" version = "26.0.0" dependencies = [ @@ -18252,7 +18361,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18306,6 +18415,7 @@ name = "sp-arithmetic" version = "23.0.0" dependencies = [ "criterion 0.4.0", + "docify", "integer-sqrt", "num-traits", "parity-scale-codec", @@ -18356,7 +18466,6 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18366,7 +18475,6 @@ dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18413,7 +18521,6 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18431,7 +18538,6 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18452,8 +18558,7 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0", - "strum 0.24.1", + "strum 0.26.2", "w3f-bls", ] @@ -18471,7 +18576,6 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18482,7 +18586,6 @@ dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18497,7 +18600,6 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18507,7 +18609,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18517,7 +18618,6 @@ version = "28.0.0" dependencies = [ "array-bytes 6.1.0", "bandersnatch_vrfs", - "bip39", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", @@ -18530,10 +18630,12 @@ dependencies = [ "hash256-std-hasher", "impl-serde", "itertools 0.10.5", + "k256", "lazy_static", "libsecp256k1", "log", - "merlin 3.0.0", + "merlin", + "parity-bip39", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -18622,7 +18724,6 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale 0.0.12", "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", ] [[package]] @@ -18645,7 +18746,7 @@ version = "0.0.0" dependencies = [ "quote", "sp-crypto-hashing", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18663,7 +18764,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf5 dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18672,7 +18773,7 @@ version = "14.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18692,7 +18793,6 @@ version = "0.25.0" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0", "sp-storage 19.0.0", ] @@ -18703,7 +18803,6 @@ dependencies = [ "serde_json", "sp-api", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18716,7 +18815,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -18729,6 +18827,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", + "polkavm-derive", "rustversion", "secp256k1", "sp-core", @@ -18750,7 +18849,7 @@ version = "31.0.0" dependencies = [ "sp-core", "sp-runtime", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] @@ -18780,7 +18879,6 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std 14.0.0", ] [[package]] @@ -18791,7 +18889,6 @@ dependencies = [ "scale-info", "sp-api", "sp-application-crypto", - "sp-std 14.0.0", ] [[package]] @@ -18808,7 +18905,6 @@ dependencies = [ "sp-core", "sp-debug-derive 14.0.0", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -18823,7 +18919,6 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 14.0.0", "substrate-test-utils", ] @@ -18831,7 +18926,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "honggfuzz", "rand", "sp-npos-elections", @@ -18920,7 +19015,7 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive 0.8.0", + "polkavm-derive", "primitive-types", "rustversion", "sp-core", @@ -18946,7 +19041,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18958,7 +19053,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -19010,7 +19105,6 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] @@ -19023,7 +19117,6 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -19043,7 +19136,6 @@ dependencies = [ "sp-externalities 0.25.0", "sp-panic-handler", "sp-runtime", - "sp-std 14.0.0", "sp-trie", "thiserror", "tracing", @@ -19069,7 +19161,6 @@ dependencies = [ "sp-externalities 0.25.0", "sp-runtime", "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", "thiserror", "x25519-dalek 2.0.0", ] @@ -19105,7 +19196,6 @@ dependencies = [ "ref-cast", "serde", "sp-debug-derive 14.0.0", - "sp-std 14.0.0", ] [[package]] @@ -19118,7 +19208,6 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -19129,7 +19218,6 @@ dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -19150,7 +19238,6 @@ name = "sp-tracing" version = "16.0.0" dependencies = [ "parity-scale-codec", - "sp-std 14.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -19174,7 +19261,6 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-trie", ] @@ -19197,7 +19283,6 @@ dependencies = [ "sp-core", "sp-externalities 0.25.0", "sp-runtime", - "sp-std 14.0.0", "thiserror", "tracing", "trie-bench", @@ -19230,7 +19315,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -19254,7 +19339,6 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 14.0.0", "wasmtime", ] @@ -19270,7 +19354,6 @@ dependencies = [ "smallvec", "sp-arithmetic", "sp-debug-derive 14.0.0", - "sp-std 14.0.0", ] [[package]] @@ -19354,7 +19437,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "staging-chain-spec-builder" version = "2.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "log", "sc-chain-spec", "serde_json", @@ -19367,7 +19450,7 @@ version = "3.0.0-dev" dependencies = [ "array-bytes 6.1.0", "assert_cmd", - "clap 4.5.1", + "clap 4.5.3", "clap_complete", "criterion 0.4.0", "frame-benchmarking", @@ -19477,7 +19560,7 @@ dependencies = [ name = "staging-node-inspect" version = "0.12.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -19653,12 +19736,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros 0.26.2", +] + +[[package]] name = "strum_macros" 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", @@ -19671,31 +19763,44 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.50", + "syn 2.0.53", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.53", ] [[package]] name = "subkey" version = "9.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "sc-cli", ] [[package]] name = "substrate-bip39" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328" +version = "0.4.7" dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.8.0", - "schnorrkel 0.9.1", - "sha2 0.9.9", + "bip39", + "hmac 0.12.1", + "pbkdf2", + "rustc-hex", + "schnorrkel 0.11.4", + "sha2 0.10.7", "zeroize", ] @@ -19724,7 +19829,7 @@ dependencies = [ name = "substrate-frame-cli" version = "32.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-support", "frame-system", "sc-cli", @@ -19881,7 +19986,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-std 14.0.0", "sp-tracing 16.0.0", "sp-transaction-pool", "sp-trie", @@ -19942,9 +20046,9 @@ dependencies = [ "console", "filetime", "parity-wasm", - "polkavm-linker 0.8.2", + "polkavm-linker", "sp-maybe-compressed-blob", - "strum 0.24.1", + "strum 0.26.2", "tempfile", "toml 0.8.8", "walkdir", @@ -20073,9 +20177,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.50" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -20091,7 +20195,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20205,7 +20309,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "futures", "futures-timer", "log", @@ -20253,7 +20357,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "futures", "futures-timer", "log", @@ -20356,7 +20460,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20492,9 +20596,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -20504,20 +20608,20 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20724,7 +20828,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20766,7 +20870,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20948,7 +21052,7 @@ version = "0.38.0" dependencies = [ "assert_cmd", "async-trait", - "clap 4.5.1", + "clap 4.5.3", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -21121,9 +21225,9 @@ 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" @@ -21186,9 +21290,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -21196,9 +21300,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" +checksum = "ead5b693d906686203f19a49e88c477fb8c15798b68cf72f60b4b5521b4ad891" dependencies = [ "erased-serde", "serde", @@ -21207,9 +21311,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +checksum = "3b9d0f4a816370c3a0d7d82d603b62198af17675b12fe5e91de6b47ceb505882" dependencies = [ "sval", "sval_buffer", @@ -21331,7 +21435,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "wasm-bindgen-shared", ] @@ -21365,7 +21469,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -21826,7 +21930,6 @@ dependencies = [ "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -21901,6 +22004,7 @@ dependencies = [ "tiny-keccak", "tokio", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -22360,10 +22464,12 @@ dependencies = [ "pallet-transaction-payment", "pallet-xcm", "parity-scale-codec", + "polkadot-service", "polkadot-test-client", "polkadot-test-runtime", "polkadot-test-service", "sp-consensus", + "sp-core", "sp-keyring", "sp-runtime", "sp-state-machine", @@ -22373,6 +22479,20 @@ dependencies = [ ] [[package]] +name = "xcm-fee-payment-runtime-api" +version = "0.1.0" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std 14.0.0", + "sp-weights", + "staging-xcm", +] + +[[package]] name = "xcm-procedural" version = "7.0.0" dependencies = [ @@ -22380,7 +22500,7 @@ dependencies = [ "proc-macro2", "quote", "staging-xcm", - "syn 2.0.50", + "syn 2.0.53", "trybuild", ] @@ -22502,14 +22622,14 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -22522,7 +22642,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 66c3094182607..770b4a29543e9 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-GyiipeXe4Ny7UAwKMEelTqiaWZH1r/VhmbdMaUH6fjQ="; + hash = "sha256-xRuV/1+OZeoth/lb5OXwVzHl2IWK1G0GgIN0E8EZlYg="; # 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. diff --git a/pkgs/applications/blockchains/solana-validator/Cargo.lock b/pkgs/applications/blockchains/solana-validator/Cargo.lock index 312da60ed048e..984d2e3828bfb 100644 --- a/pkgs/applications/blockchains/solana-validator/Cargo.lock +++ b/pkgs/applications/blockchains/solana-validator/Cargo.lock @@ -13,6 +13,15 @@ dependencies = [ ] [[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -60,21 +69,22 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -117,6 +127,12 @@ dependencies = [ ] [[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.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -126,6 +142,12 @@ dependencies = [ ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -135,10 +157,16 @@ dependencies = [ ] [[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" @@ -187,7 +215,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "paste", "rustc_version 0.4.0", @@ -200,7 +228,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.28", + "quote", "syn 1.0.109", ] @@ -210,10 +238,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -239,7 +267,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint 0.4.3", + "num-bigint 0.4.4", ] [[package]] @@ -248,8 +276,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -277,9 +305,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -300,7 +328,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.9", + "time", ] [[package]] @@ -309,8 +337,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -321,8 +349,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -348,9 +376,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -359,9 +387,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.14" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" dependencies = [ "brotli", "flate2", @@ -396,20 +424,20 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -440,13 +468,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.4" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -456,22 +484,21 @@ dependencies = [ "matchit", "memchr", "mime", - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", "pin-project-lite", "rustversion", "serde", "sync_wrapper", "tower", - "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", "bytes", @@ -491,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", "pin-project-lite", "rand 0.8.5", @@ -499,6 +526,21 @@ dependencies = [ ] [[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -512,9 +554,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -537,19 +579,19 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "peeking_take_while", "prettyplease 0.2.4", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -574,6 +616,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +dependencies = [ + "serde", +] + +[[package]] name = "bitmaps" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -584,9 +635,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec", @@ -659,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ "borsh-derive 0.10.3", - "hashbrown 0.11.2", + "hashbrown 0.12.3", ] [[package]] @@ -671,7 +722,7 @@ dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.60", + "proc-macro2", "syn 1.0.109", ] @@ -684,7 +735,7 @@ dependencies = [ "borsh-derive-internal 0.10.3", "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.60", + "proc-macro2", "syn 1.0.109", ] @@ -694,8 +745,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -705,8 +756,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -716,8 +767,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -727,8 +778,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -776,7 +827,7 @@ checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", - "regex-automata", + "regex-automata 0.1.10", "serde", ] @@ -814,9 +865,9 @@ dependencies = [ [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" [[package]] name = "bytemuck" @@ -833,22 +884,22 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytesize" @@ -913,7 +964,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -929,12 +980,19 @@ dependencies = [ ] [[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.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -960,30 +1018,56 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.43", "wasm-bindgen", - "winapi 0.3.9", + "windows-targets 0.48.0", ] [[package]] name = "chrono-humanize" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32dce1ea1988dbdf9f9815ff11425828523bd2a134ec0805d2ac8af26ee6096e" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" dependencies = [ "chrono", ] [[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] name = "cipher" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1011,7 +1095,7 @@ checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -1025,10 +1109,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", - "clap_lex", - "indexmap", + "clap_lex 0.2.4", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", @@ -1036,15 +1120,34 @@ dependencies = [ ] [[package]] +name = "clap" +version = "4.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +dependencies = [ + "anstyle", + "clap_lex 0.5.0", +] + +[[package]] name = "clap_derive" version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1058,6 +1161,12 @@ dependencies = [ ] [[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] name = "combine" version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1120,29 +1229,29 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "const_format" -version = "0.2.30" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.29" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "unicode-xid 0.2.2", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1180,9 +1289,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -1197,12 +1306,48 @@ dependencies = [ ] [[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast 0.3.0", + "ciborium", + "clap 4.3.21", + "criterion-plot", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast 0.3.0", + "itertools", +] + +[[package]] name = "criterion-stats" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "387df94cb74ada1b33e10ce034bb0d9360cc73edb5063e7d7d4120a40ee1c9d2" dependencies = [ - "cast", + "cast 0.2.7", "num-traits", "num_cpus", "rand 0.4.6", @@ -1279,9 +1424,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -1291,9 +1436,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -1309,11 +1454,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.3.1" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ - "nix", + "nix 0.27.1", "windows-sys 0.48.0", ] @@ -1349,10 +1494,10 @@ checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "strsim 0.10.0", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -1362,8 +1507,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", - "quote 1.0.28", - "syn 2.0.18", + "quote", + "syn 2.0.38", ] [[package]] @@ -1379,13 +1524,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.2.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "num_cpus", - "parking_lot 0.12.1", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core 0.9.8", ] [[package]] @@ -1412,7 +1559,7 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "rusticata-macros", ] @@ -1429,8 +1576,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1441,8 +1588,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" dependencies = [ "convert_case", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "rustc_version 0.3.3", "syn 1.0.109", ] @@ -1530,32 +1677,32 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] -name = "dlopen" -version = "0.1.8" +name = "dlopen2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" dependencies = [ - "dlopen_derive", - "lazy_static", + "dlopen2_derive", "libc", + "once_cell", "winapi 0.3.9", ] [[package]] -name = "dlopen_derive" -version = "0.1.4" +name = "dlopen2_derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -1602,7 +1749,7 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] @@ -1612,16 +1759,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -1653,9 +1800,9 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -1664,10 +1811,10 @@ version = "3.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1685,6 +1832,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1707,16 +1860,17 @@ dependencies = [ [[package]] name = "etcd-client" -version = "0.8.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3bfae4cb9cd8c3c2a552d45e155cafd079f385a3b9421b9a010878f44531f1e" +checksum = "f4b0ea5ef6dc2388a4b1669fa32097249bc03a15417b97cb75e38afb309e4a89" dependencies = [ "http", - "prost 0.9.0", + "prost", "tokio", "tokio-stream", - "tonic 0.6.2", - "tonic-build 0.6.2", + "tonic", + "tonic-build", + "tower", "tower-service", ] @@ -1743,18 +1897,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.6.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fd-lock" -version = "3.0.12" +version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" +checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if 1.0.0", "rustix", @@ -1798,9 +1949,9 @@ checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1838,14 +1989,20 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", ] [[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + +[[package]] name = "fs_extra" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1918,9 +2075,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -1970,7 +2127,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "log", "managed", @@ -1980,7 +2137,7 @@ dependencies = [ [[package]] name = "gen-headers" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", "regex", @@ -1988,7 +2145,7 @@ dependencies = [ [[package]] name = "gen-syscall-list" -version = "1.16.26" +version = "1.17.28" dependencies = [ "regex", ] @@ -2038,9 +2195,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2050,6 +2207,12 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2083,7 +2246,7 @@ dependencies = [ "serde_json", "simpl", "smpl_jwt", - "time 0.3.9", + "time", "tokio", ] @@ -2100,9 +2263,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -2110,7 +2273,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.0.2", "slab", "tokio", "tokio-util 0.7.1", @@ -2118,6 +2281,12 @@ dependencies = [ ] [[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] name = "hash32" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2150,17 +2319,23 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", ] [[package]] +name = "hashbrown" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" + +[[package]] name = "headers" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -2180,15 +2355,6 @@ dependencies = [ [[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" @@ -2204,15 +2370,6 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" @@ -2225,9 +2382,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hidapi" -version = "2.3.3" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f841dbb77615e116fb2ca38044b42310370f0d093c774a72361670ff2ae431b" +checksum = "723777263b0dcc5730aec947496bd8c3940ba63c15f5633b288cc615f4f6af79" dependencies = [ "cc", "libc", @@ -2294,12 +2451,6 @@ dependencies = [ ] [[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[package]] name = "httparse" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2319,9 +2470,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -2334,7 +2485,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -2361,15 +2512,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.20.8", + "rustls", "tokio", - "tokio-rustls 0.23.3", + "tokio-rustls", ] [[package]] @@ -2429,9 +2581,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2473,14 +2625,24 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", "rayon", ] [[package]] name = "indicatif" -version = "0.17.4" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -2499,23 +2661,23 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.10" +name = "ipnet" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.1", - "libc", + "rustix", "windows-sys 0.48.0", ] [[package]] -name = "ipnet" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2526,9 +2688,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -2541,9 +2703,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2610,8 +2772,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2709,9 +2871,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2804,6 +2966,18 @@ dependencies = [ ] [[package]] +name = "light-poseidon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" +dependencies = [ + "ark-bn254", + "ark-ff", + "num-bigint 0.4.4", + "thiserror", +] + +[[package]] name = "linked-hash-map" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2811,27 +2985,25 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" @@ -2888,9 +3060,9 @@ checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memmap2" @@ -2969,24 +3141,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", ] [[package]] @@ -3005,8 +3166,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3047,16 +3208,26 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.3.3", + "cfg-if 1.0.0", + "libc", ] [[package]] @@ -3077,14 +3248,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] name = "num" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3111,9 +3274,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3136,20 +3299,20 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -3187,9 +3350,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3197,11 +3360,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "libc", ] @@ -3225,11 +3388,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ - "num_enum_derive 0.7.0", + "num_enum_derive 0.7.1", ] [[package]] @@ -3239,8 +3402,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3251,21 +3414,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -3284,6 +3447,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] name = "oid-registry" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3294,9 +3466,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "oorandom" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -3312,11 +3490,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.3.3", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3331,8 +3509,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3353,9 +3531,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.89" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4026ef4fae4cd0c85aee4846e497cea7855659077108067c0d37c0d628f3e40a" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -3377,7 +3555,7 @@ dependencies = [ "futures-util", "js-sys", "lazy_static", - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", "pin-project", "rand 0.8.5", "thiserror", @@ -3407,8 +3585,8 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3444,7 +3622,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core 0.9.8", ] [[package]] @@ -3463,15 +3641,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.1" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.10", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.32.0", + "windows-targets 0.48.0", ] [[package]] @@ -3521,9 +3699,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "percentage" @@ -3561,8 +3739,8 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -3584,7 +3762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -3612,16 +3790,16 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3653,6 +3831,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] +name = "plotters" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" + +[[package]] +name = "plotters-svg" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +dependencies = [ + "plotters-backend", +] + +[[package]] name = "polyval" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3718,7 +3924,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" dependencies = [ - "proc-macro2 1.0.60", + "proc-macro2", "syn 1.0.109", ] @@ -3728,8 +3934,8 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ - "proc-macro2 1.0.60", - "syn 2.0.18", + "proc-macro2", + "syn 2.0.38", ] [[package]] @@ -3758,8 +3964,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -3770,44 +3976,35 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "version_check", ] [[package]] name = "proc-macro2" -version = "0.4.30" +version = "1.0.69" 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.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bit-set", - "bitflags", - "byteorder", + "bit-vec", + "bitflags 2.3.3", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rusty-fork", "tempfile", "unarray", @@ -3815,60 +4012,30 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.11.9", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-build" -version = "0.11.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck 0.4.0", + "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", "prettyplease 0.1.9", - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "regex", "syn 1.0.109", "tempfile", @@ -3877,55 +4044,32 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - -[[package]] -name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost 0.11.9", + "prost", ] [[package]] name = "proto" -version = "1.16.26" +version = "1.17.28" dependencies = [ "protobuf-src", - "tonic-build 0.8.4", + "tonic-build", ] [[package]] @@ -3943,7 +4087,18 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" dependencies = [ - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", +] + +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -3954,70 +4109,59 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[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", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.20.8", + "rustls", "thiserror", "tokio", "tracing", - "webpki 0.22.0", ] [[package]] name = "quinn-proto" -version = "0.9.5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" +checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", "ring", "rustc-hash", - "rustls 0.20.8", + "rustls", "rustls-native-certs", "slab", "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", ] [[package]] name = "quinn-udp" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0" dependencies = [ + "bytes", "libc", - "quinn-proto", - "socket2", + "socket2 0.5.5", "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", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.60", + "proc-macro2", ] [[package]] @@ -4107,7 +4251,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -4145,9 +4289,9 @@ checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -4155,19 +4299,17 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rbpf-cli" -version = "1.16.26" +version = "1.17.28" [[package]] name = "rcgen" @@ -4177,7 +4319,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring", - "time 0.3.9", + "time", "yasna", ] @@ -4196,7 +4338,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4205,7 +4347,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4214,7 +4356,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "redox_syscall 0.2.10", ] @@ -4235,13 +4377,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick 1.0.1", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4251,25 +4394,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick 1.0.1", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "async-compression", - "base64 0.21.2", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4286,23 +4440,24 @@ dependencies = [ "mime", "native-tls", "once_cell", - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", "pin-project-lite", - "rustls 0.20.8", + "rustls", "rustls-pemfile 1.0.0", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.3", + "tokio-rustls", "tokio-util 0.7.1", "tower-service", - "url 2.3.1", + "url 2.4.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.2", "winreg", ] @@ -4388,7 +4543,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver 1.0.20", ] [[package]] @@ -4402,13 +4557,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.18" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys 0.48.0", @@ -4416,27 +4570,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ - "base64 0.13.1", "log", "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "rustls-webpki", + "sct", ] [[package]] @@ -4470,10 +4611,20 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rusty-fork" @@ -4514,9 +4665,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll" @@ -4533,23 +4684,13 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sct" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" @@ -4564,7 +4705,7 @@ version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -4592,9 +4733,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -4610,38 +4751,38 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.163" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4677,9 +4818,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -4688,7 +4829,7 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", @@ -4696,11 +4837,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.21" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4709,11 +4850,11 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ - "dashmap 5.2.0", + "dashmap 5.5.3", "futures 0.3.28", "lazy_static", "log", @@ -4723,14 +4864,13 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -4770,6 +4910,17 @@ dependencies = [ ] [[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] name = "sha2" version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4784,9 +4935,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -4832,15 +4983,15 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -4868,6 +5019,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" [[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] name = "sized-chunks" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4885,9 +5042,9 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.7.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smpl_jwt" @@ -4902,7 +5059,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.3.9", + "time", ] [[package]] @@ -4916,6 +5073,16 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "soketto" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4932,10 +5099,11 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.26" +version = "1.17.28" dependencies = [ "Inflector", - "base64 0.21.2", + "assert_matches", + "base64 0.21.4", "bincode", "bs58", "bv", @@ -4943,12 +5111,12 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", "spl-pod", "spl-token", "spl-token-2022", + "spl-token-group-interface", "spl-token-metadata-interface", "thiserror", "zstd", @@ -4956,27 +5124,28 @@ dependencies = [ [[package]] name = "solana-accounts-bench" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "log", "rayon", + "solana-accounts-db", "solana-logger", "solana-measure", - "solana-runtime", "solana-sdk", "solana-version", ] [[package]] name = "solana-accounts-cluster-bench" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "solana-account-decoder", + "solana-accounts-db", "solana-clap-utils", "solana-cli-config", "solana-client", @@ -4998,8 +5167,72 @@ dependencies = [ ] [[package]] +name = "solana-accounts-db" +version = "1.17.28" +dependencies = [ + "arrayref", + "assert_matches", + "bincode", + "blake3", + "bv", + "bytemuck", + "byteorder", + "bzip2", + "crossbeam-channel", + "dashmap 4.0.2", + "ed25519-dalek", + "flate2", + "fnv", + "fs-err", + "im", + "index_list", + "itertools", + "lazy_static", + "libsecp256k1", + "log", + "lz4", + "memmap2", + "memoffset 0.9.0", + "modular-bitfield", + "num-derive 0.3.3", + "num-traits", + "num_cpus", + "num_enum 0.6.1", + "ouroboros", + "percentage", + "qualifier_attr", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rayon", + "regex", + "rustc_version 0.4.0", + "serde", + "serde_derive", + "solana-accounts-db", + "solana-bucket-map", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-logger", + "solana-measure", + "solana-metrics", + "solana-program-runtime", + "solana-rayon-threadlimit", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", + "static_assertions", + "strum", + "strum_macros", + "tar", + "tempfile", + "thiserror", +] + +[[package]] name = "solana-address-lookup-table-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "bytemuck", @@ -5018,7 +5251,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program-tests" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "bincode", @@ -5029,12 +5262,12 @@ dependencies = [ [[package]] name = "solana-banking-bench" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 3.2.23", "crossbeam-channel", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "solana-client", "solana-core", @@ -5053,7 +5286,7 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "borsh 0.10.3", "futures 0.3.28", @@ -5070,7 +5303,7 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.16.26" +version = "1.17.28" dependencies = [ "serde", "solana-sdk", @@ -5079,11 +5312,12 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "crossbeam-channel", "futures 0.3.28", + "solana-accounts-db", "solana-banks-interface", "solana-client", "solana-runtime", @@ -5096,7 +5330,7 @@ dependencies = [ [[package]] name = "solana-bench-streamer" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 3.2.23", "crossbeam-channel", @@ -5107,15 +5341,15 @@ dependencies = [ [[package]] name = "solana-bench-tps" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "crossbeam-channel", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "serde_json", - "serde_yaml 0.9.21", + "serde_yaml 0.9.25", "serial_test", "solana-clap-utils", "solana-cli-config", @@ -5148,12 +5382,12 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bv", "fnv", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "rustc_version 0.4.0", "serde", @@ -5165,25 +5399,28 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "byteorder", "libsecp256k1", "log", "memoffset 0.9.0", - "rand 0.7.3", + "rand 0.8.5", + "scopeguard", "solana-measure", "solana-program-runtime", "solana-sdk", "solana-zk-token-sdk", "solana_rbpf", + "test-case", "thiserror", ] [[package]] name = "solana-bpf-loader-program-tests" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "bincode", @@ -5194,15 +5431,16 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bv", + "bytemuck", "fs_extra", "log", "memmap2", "modular-bitfield", "num_enum 0.6.1", - "rand 0.7.3", + "rand 0.8.5", "rayon", "solana-logger", "solana-measure", @@ -5212,28 +5450,26 @@ dependencies = [ [[package]] name = "solana-cargo-build-bpf" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "cargo_metadata", - "clap 3.2.23", "log", "solana-logger", - "solana-sdk", ] [[package]] name = "solana-cargo-build-sbf" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_cmd", "bzip2", "cargo_metadata", "clap 3.2.23", + "itertools", "log", "predicates", "regex", "reqwest", - "semver 1.0.17", + "semver 1.0.20", "serial_test", "solana-download-utils", "solana-logger", @@ -5243,47 +5479,44 @@ dependencies = [ [[package]] name = "solana-cargo-test-bpf" -version = "1.16.26" -dependencies = [ - "cargo_metadata", - "clap 3.2.23", -] +version = "1.17.28" [[package]] name = "solana-cargo-test-sbf" -version = "1.16.26" +version = "1.17.28" dependencies = [ "cargo_metadata", "clap 3.2.23", + "itertools", "log", "solana-logger", ] [[package]] name = "solana-clap-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "chrono", "clap 2.33.3", "rpassword", - "solana-perf", "solana-remote-wallet", "solana-sdk", "tempfile", "thiserror", "tiny-bip39", "uriparse", - "url 2.3.1", + "url 2.4.1", ] [[package]] name = "solana-clap-v3-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "chrono", "clap 3.2.23", "rpassword", - "solana-perf", "solana-remote-wallet", "solana-sdk", "solana-zk-token-sdk", @@ -5291,13 +5524,14 @@ dependencies = [ "thiserror", "tiny-bip39", "uriparse", - "url 2.3.1", + "url 2.4.1", ] [[package]] name = "solana-cli" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "bs58", "clap 2.33.3", @@ -5312,12 +5546,11 @@ dependencies = [ "num-traits", "pretty-hex", "reqwest", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-clap-utils", "solana-cli-config", @@ -5325,6 +5558,7 @@ dependencies = [ "solana-client", "solana-config-program", "solana-faucet", + "solana-loader-v4-program", "solana-logger", "solana-program-runtime", "solana-pubsub-client", @@ -5348,25 +5582,25 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.16.26" +version = "1.17.28" dependencies = [ "anyhow", "dirs-next", "lazy_static", "serde", "serde_derive", - "serde_yaml 0.9.21", + "serde_yaml 0.9.25", "solana-clap-utils", "solana-sdk", - "url 2.3.1", + "url 2.4.1", ] [[package]] name = "solana-cli-output" -version = "1.16.26" +version = "1.17.28" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.21.4", "chrono", "clap 2.33.3", "console", @@ -5374,7 +5608,7 @@ dependencies = [ "humantime", "indicatif", "pretty-hex", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_json", "solana-account-decoder", @@ -5389,19 +5623,18 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "async-trait", "bincode", "crossbeam-channel", + "dashmap 4.0.2", "futures 0.3.28", "futures-util", - "indexmap", + "indexmap 2.0.2", "indicatif", "log", "quinn", - "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", "solana-connection-cache", "solana-measure", @@ -5422,10 +5655,12 @@ dependencies = [ [[package]] name = "solana-client-test" -version = "1.16.26" +version = "1.17.28" dependencies = [ "futures-util", + "rand 0.8.5", "serde_json", + "solana-client", "solana-ledger", "solana-logger", "solana-measure", @@ -5450,7 +5685,7 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5458,7 +5693,7 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "chrono", @@ -5471,16 +5706,17 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.26" +version = "1.17.28" dependencies = [ "async-trait", "bincode", + "crossbeam-channel", "futures-util", - "indexmap", + "indexmap 2.0.2", "indicatif", "log", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", "rcgen", "solana-logger", @@ -5494,38 +5730,46 @@ dependencies = [ [[package]] name = "solana-core" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "assert_matches", + "base64 0.21.4", "bincode", "bs58", + "bytes", "chrono", "crossbeam-channel", "dashmap 4.0.2", "eager", "etcd-client", "fs_extra", + "futures 0.3.28", "histogram", "itertools", "lazy_static", "log", "lru", - "matches", "min-max-heap", "num_enum 0.6.1", - "rand 0.7.3", - "rand_chacha 0.2.2", + "quinn", + "rand 0.8.5", + "rand_chacha 0.3.1", "raptorq", "rayon", + "rcgen", "rolling-file", "rustc_version 0.4.0", + "rustls", "serde", + "serde_bytes", "serde_derive", "serde_json", "serial_test", - "solana-address-lookup-table-program", + "solana-accounts-db", "solana-bloom", "solana-client", + "solana-core", + "solana-cost-model", "solana-entry", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -5539,6 +5783,7 @@ dependencies = [ "solana-perf", "solana-poh", "solana-program-runtime", + "solana-quic-client", "solana-rayon-threadlimit", "solana-rpc", "solana-rpc-client-api", @@ -5549,7 +5794,9 @@ dependencies = [ "solana-streamer", "solana-tpu-client", "solana-transaction-status", + "solana-turbine", "solana-version", + "solana-vote", "solana-vote-program", "static_assertions", "strum", @@ -5565,15 +5812,40 @@ dependencies = [ ] [[package]] +name = "solana-cost-model" +version = "1.17.28" +dependencies = [ + "lazy_static", + "log", + "rustc_version 0.4.0", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-loader-v4-program", + "solana-logger", + "solana-metrics", + "solana-program-runtime", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", + "static_assertions", + "test-case", +] + +[[package]] name = "solana-dos" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "clap 3.2.23", "crossbeam-channel", "itertools", "log", - "rand 0.7.3", + "rand 0.8.5", "serde", "solana-bench-tps", "solana-client", @@ -5596,7 +5868,7 @@ dependencies = [ [[package]] name = "solana-download-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ "console", "indicatif", @@ -5608,27 +5880,26 @@ dependencies = [ [[package]] name = "solana-ed25519-program-tests" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "ed25519-dalek", - "rand 0.7.3", + "rand 0.8.5", "solana-program-test", "solana-sdk", ] [[package]] name = "solana-entry" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "crossbeam-channel", - "dlopen", - "dlopen_derive", + "dlopen2", "lazy_static", "log", - "matches", - "rand 0.7.3", + "rand 0.8.5", "rayon", "serde", "solana-logger", @@ -5642,7 +5913,7 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "byteorder", @@ -5664,9 +5935,10 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", + "bitflags 2.3.3", "blake3", "block-buffer 0.10.4", "bs58", @@ -5675,19 +5947,16 @@ dependencies = [ "cc", "either", "generic-array 0.14.7", - "getrandom 0.1.16", "im", "lazy_static", "log", "memmap2", - "once_cell", - "rand_core 0.6.4", "rustc_version 0.4.0", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "solana-frozen-abi-macro", "solana-logger", "subtle", @@ -5696,25 +5965,26 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "rustc_version 0.4.0", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] name = "solana-genesis" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bincode", "clap 2.33.3", "itertools", "serde", "serde_json", - "serde_yaml 0.9.21", + "serde_yaml 0.9.25", + "solana-accounts-db", "solana-clap-utils", "solana-cli-config", "solana-entry", @@ -5730,18 +6000,18 @@ dependencies = [ [[package]] name = "solana-genesis-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", + "solana-accounts-db", "solana-download-utils", "solana-rpc-client", - "solana-runtime", "solana-sdk", ] [[package]] name = "solana-geyser-plugin-interface" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", "solana-sdk", @@ -5751,7 +6021,7 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-manager" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bs58", "crossbeam-channel", @@ -5761,6 +6031,7 @@ dependencies = [ "libloading", "log", "serde_json", + "solana-accounts-db", "solana-entry", "solana-geyser-plugin-interface", "solana-ledger", @@ -5775,25 +6046,25 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "bv", "clap 2.33.3", "crossbeam-channel", "flate2", - "indexmap", + "indexmap 2.0.2", "itertools", "log", "lru", - "matches", "num-traits", "num_cpus", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", - "regex", "rustc_version 0.4.0", + "rustversion", "serde", "serde_bytes", "serde_derive", @@ -5817,14 +6088,16 @@ dependencies = [ "solana-thin-client", "solana-tpu-client", "solana-version", + "solana-vote", "solana-vote-program", "static_assertions", + "test-case", "thiserror", ] [[package]] name = "solana-install" -version = "1.16.26" +version = "1.17.28" dependencies = [ "atty", "bincode", @@ -5837,13 +6110,13 @@ dependencies = [ "dirs-next", "indicatif", "lazy_static", - "nix", + "nix 0.26.4", "reqwest", "scopeguard", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_yaml 0.8.26", - "serde_yaml 0.9.21", + "serde_yaml 0.9.25", "solana-clap-utils", "solana-config-program", "solana-logger", @@ -5852,14 +6125,14 @@ dependencies = [ "solana-version", "tar", "tempfile", - "url 2.3.1", + "url 2.4.1", "winapi 0.3.9", "winreg", ] [[package]] name = "solana-keygen" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bs58", "clap 3.2.23", @@ -5876,11 +6149,11 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "bincode", - "bitflags", + "bitflags 2.3.3", "bs58", "byteorder", "chrono", @@ -5894,12 +6167,11 @@ dependencies = [ "libc", "log", "lru", - "matches", "num_cpus", "num_enum 0.6.1", - "prost 0.11.9", - "rand 0.7.3", - "rand_chacha 0.2.2", + "prost", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", "reed-solomon-erasure", "rocksdb", @@ -5907,9 +6179,11 @@ dependencies = [ "scopeguard", "serde", "serde_bytes", - "sha2 0.10.6", + "sha2 0.10.8", "solana-account-decoder", + "solana-accounts-db", "solana-bpf-loader-program", + "solana-cost-model", "solana-entry", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -5925,11 +6199,14 @@ dependencies = [ "solana-storage-bigtable", "solana-storage-proto", "solana-transaction-status", + "solana-vote", "solana-vote-program", "spl-pod", "spl-token", "spl-token-2022", "static_assertions", + "strum", + "strum_macros", "tempfile", "test-case", "thiserror", @@ -5940,7 +6217,7 @@ dependencies = [ [[package]] name = "solana-ledger-tool" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_cmd", "bs58", @@ -5960,10 +6237,12 @@ dependencies = [ "serde_json", "signal-hook", "solana-account-decoder", + "solana-accounts-db", "solana-bpf-loader-program", "solana-clap-utils", "solana-cli-output", "solana-core", + "solana-cost-model", "solana-entry", "solana-geyser-plugin-manager", "solana-gossip", @@ -5987,11 +6266,10 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "log", - "rand 0.7.3", "solana-measure", "solana-program-runtime", "solana-sdk", @@ -6000,7 +6278,7 @@ dependencies = [ [[package]] name = "solana-local-cluster" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "crossbeam-channel", @@ -6008,9 +6286,10 @@ dependencies = [ "gag", "itertools", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "serial_test", + "solana-accounts-db", "solana-client", "solana-config-program", "solana-core", @@ -6028,14 +6307,17 @@ dependencies = [ "solana-streamer", "solana-thin-client", "solana-tpu-client", + "solana-turbine", + "solana-vote", "solana-vote-program", + "static_assertions", "tempfile", "trees", ] [[package]] name = "solana-log-analyzer" -version = "1.16.26" +version = "1.17.28" dependencies = [ "byte-unit", "clap 3.2.23", @@ -6047,7 +6329,7 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.26" +version = "1.17.28" dependencies = [ "env_logger", "lazy_static", @@ -6056,7 +6338,7 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", "solana-sdk", @@ -6064,52 +6346,52 @@ dependencies = [ [[package]] name = "solana-memory-management" -version = "1.16.26" +version = "1.17.28" [[package]] name = "solana-merkle-root-bench" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "log", + "solana-accounts-db", "solana-logger", "solana-measure", - "solana-runtime", "solana-sdk", "solana-version", ] [[package]] name = "solana-merkle-tree" -version = "1.16.26" +version = "1.17.28" dependencies = [ "fast-math", "hex", - "matches", "solana-program", ] [[package]] name = "solana-metrics" -version = "1.16.26" +version = "1.17.28" dependencies = [ "crossbeam-channel", "env_logger", "gethostname", "lazy_static", "log", - "rand 0.7.3", + "rand 0.8.5", "reqwest", "serial_test", "solana-sdk", + "thiserror", ] [[package]] name = "solana-net-shaper" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 3.2.23", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "solana-logger", @@ -6117,27 +6399,27 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "clap 3.2.23", "crossbeam-channel", "log", - "nix", - "rand 0.7.3", + "nix 0.26.4", + "rand 0.8.5", "serde", "serde_derive", - "socket2", + "socket2 0.5.5", "solana-logger", "solana-sdk", "solana-version", "tokio", - "url 2.3.1", + "url 2.4.1", ] [[package]] name = "solana-notifier" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", "reqwest", @@ -6147,25 +6429,27 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", + "assert_matches", "bincode", "bv", "caps", "curve25519-dalek", - "dlopen", - "dlopen_derive", + "dlopen2", "fnv", "lazy_static", "libc", "log", - "matches", - "nix", - "rand 0.7.3", - "rand_chacha 0.2.2", + "nix 0.26.4", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", + "rustc_version 0.4.0", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-logger", "solana-metrics", "solana-rayon-threadlimit", @@ -6176,14 +6460,14 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "core_affinity", "crossbeam-channel", "log", - "matches", - "rand 0.7.3", + "rand 0.8.5", "solana-entry", "solana-ledger", "solana-logger", @@ -6197,11 +6481,10 @@ dependencies = [ [[package]] name = "solana-poh-bench" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 3.2.23", "log", - "rand 0.7.3", "rayon", "solana-entry", "solana-logger", @@ -6213,7 +6496,7 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "anyhow", "ark-bn254", @@ -6222,9 +6505,9 @@ dependencies = [ "ark-serialize", "array-bytes", "assert_matches", - "base64 0.21.2", + "base64 0.21.4", "bincode", - "bitflags", + "bitflags 2.3.3", "blake3", "borsh 0.10.3", "borsh 0.9.3", @@ -6235,27 +6518,27 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.8", + "getrandom 0.2.10", "itertools", "js-sys", "lazy_static", "libc", "libsecp256k1", + "light-poseidon", "log", "memoffset 0.9.0", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-derive 0.3.3", "num-traits", "parking_lot 0.12.1", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "sha3 0.10.4", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -6270,19 +6553,21 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "assert_matches", + "base64 0.21.4", "bincode", "eager", "enum-iterator", "itertools", "libc", + "libsecp256k1", "log", "num-derive 0.3.3", "num-traits", "percentage", - "rand 0.7.3", + "rand 0.8.5", "rustc_version 0.4.0", "serde", "solana-frozen-abi", @@ -6297,16 +6582,17 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bincode", "chrono-humanize", "crossbeam-channel", "log", "serde", + "solana-accounts-db", "solana-banks-client", "solana-banks-interface", "solana-banks-server", @@ -6317,20 +6603,22 @@ dependencies = [ "solana-sdk", "solana-stake-program", "solana-vote-program", + "solana_rbpf", + "test-case", "thiserror", "tokio", ] [[package]] name = "solana-pubsub-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "anyhow", "crossbeam-channel", "futures-util", "log", "reqwest", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_derive", "serde_json", @@ -6342,12 +6630,12 @@ dependencies = [ "tokio-stream", "tokio-tungstenite", "tungstenite", - "url 2.3.1", + "url 2.4.1", ] [[package]] name = "solana-quic-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "async-mutex", "async-trait", @@ -6358,9 +6646,8 @@ dependencies = [ "log", "quinn", "quinn-proto", - "quinn-udp", "rcgen", - "rustls 0.20.8", + "rustls", "solana-connection-cache", "solana-logger", "solana-measure", @@ -6376,7 +6663,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.26" +version = "1.17.28" dependencies = [ "lazy_static", "num_cpus", @@ -6384,8 +6671,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "console", "dialoguer", "hidapi", @@ -6394,7 +6682,7 @@ dependencies = [ "num-traits", "parking_lot 0.12.1", "qstring", - "semver 1.0.17", + "semver 1.0.20", "solana-sdk", "thiserror", "uriparse", @@ -6402,9 +6690,9 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bincode", "bs58", "crossbeam-channel", @@ -6425,7 +6713,7 @@ dependencies = [ "serial_test", "soketto", "solana-account-decoder", - "solana-address-lookup-table-program", + "solana-accounts-db", "solana-client", "solana-entry", "solana-faucet", @@ -6447,6 +6735,7 @@ dependencies = [ "solana-tpu-client", "solana-transaction-status", "solana-version", + "solana-vote", "solana-vote-program", "spl-pod", "spl-token", @@ -6460,11 +6749,11 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.2", + "base64 0.21.4", "bincode", "bs58", "crossbeam-channel", @@ -6474,7 +6763,7 @@ dependencies = [ "jsonrpc-http-server", "log", "reqwest", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_derive", "serde_json", @@ -6489,13 +6778,13 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bs58", "jsonrpc-core", "reqwest", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_derive", "serde_json", @@ -6509,7 +6798,7 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.26" +version = "1.17.28" dependencies = [ "anyhow", "clap 2.33.3", @@ -6526,7 +6815,7 @@ dependencies = [ [[package]] name = "solana-rpc-test" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "bs58", @@ -6553,11 +6842,11 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.16.26" +version = "1.17.28" dependencies = [ "arrayref", "assert_matches", - "base64 0.21.2", + "base64 0.21.4", "bincode", "blake3", "bv", @@ -6570,6 +6859,7 @@ dependencies = [ "ed25519-dalek", "flate2", "fnv", + "fs-err", "im", "index_list", "itertools", @@ -6585,22 +6875,25 @@ dependencies = [ "num-traits", "num_cpus", "num_enum 0.6.1", - "once_cell", "ouroboros", "percentage", - "rand 0.7.3", - "rand_chacha 0.2.2", + "qualifier_attr", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", "regex", "rustc_version 0.4.0", "serde", "serde_derive", "serde_json", + "siphasher", + "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", + "solana-cost-model", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-loader-v4-program", @@ -6610,10 +6903,12 @@ dependencies = [ "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", + "solana-runtime", "solana-sdk", "solana-stake-program", "solana-system-program", "solana-version", + "solana-vote", "solana-vote-program", "solana-zk-token-proof-program", "solana-zk-token-sdk", @@ -6630,13 +6925,13 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.26" +version = "1.17.28" dependencies = [ "anyhow", "assert_matches", - "base64 0.21.2", + "base64 0.21.4", "bincode", - "bitflags", + "bitflags 2.3.3", "borsh 0.10.3", "bs58", "bytemuck", @@ -6661,8 +6956,9 @@ dependencies = [ "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", + "qualifier_attr", "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version 0.4.0", "rustversion", "serde", @@ -6670,12 +6966,13 @@ dependencies = [ "serde_derive", "serde_json", "serde_with", - "sha2 0.10.6", + "sha2 0.10.8", "sha3 0.10.4", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", "solana-program", + "solana-sdk", "solana-sdk-macro", "static_assertions", "thiserror", @@ -6686,18 +6983,24 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bs58", - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "rustversion", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] +name = "solana-security-txt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" + +[[package]] name = "solana-send-transaction-service" -version = "1.16.26" +version = "1.17.28" dependencies = [ "crossbeam-channel", "log", @@ -6712,7 +7015,7 @@ dependencies = [ [[package]] name = "solana-stake-accounts" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "solana-clap-utils", @@ -6728,7 +7031,7 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "bincode", @@ -6745,7 +7048,7 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.16.26" +version = "1.17.28" dependencies = [ "backoff", "bincode", @@ -6760,8 +7063,8 @@ dependencies = [ "hyper-proxy", "log", "openssl", - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "serde", "serde_derive", "smpl_jwt", @@ -6771,61 +7074,61 @@ dependencies = [ "solana-transaction-status", "thiserror", "tokio", - "tonic 0.8.3", + "tonic", "zstd", ] [[package]] name = "solana-storage-proto" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "bs58", "enum-iterator", - "prost 0.11.9", + "prost", "protobuf-src", "serde", "solana-account-decoder", "solana-sdk", "solana-transaction-status", - "tonic-build 0.8.4", + "tonic-build", ] [[package]] name = "solana-store-tool" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "log", + "solana-accounts-db", "solana-logger", - "solana-runtime", "solana-sdk", "solana-version", ] [[package]] name = "solana-streamer" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "async-channel", "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap", + "indexmap 2.0.2", "itertools", "libc", "log", - "nix", + "nix 0.26.4", "pem", "percentage", "pkcs8", "quinn", "quinn-proto", - "quinn-udp", - "rand 0.7.3", + "rand 0.8.5", "rcgen", - "rustls 0.20.8", + "rustls", "solana-logger", "solana-metrics", "solana-perf", @@ -6837,7 +7140,7 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "assert_matches", "bincode", @@ -6851,14 +7154,15 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.16.26" +version = "1.17.28" dependencies = [ - "base64 0.21.2", + "base64 0.21.4", "bincode", "crossbeam-channel", "log", "serde_derive", "serde_json", + "solana-accounts-db", "solana-cli-output", "solana-client", "solana-core", @@ -6880,7 +7184,7 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "log", @@ -6894,15 +7198,16 @@ dependencies = [ [[package]] name = "solana-tokens" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "chrono", "clap 2.33.3", "console", "csv", "ctrlc", - "indexmap", + "indexmap 2.0.2", "indicatif", "pickledb", "serde", @@ -6926,16 +7231,14 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 2.0.2", "indicatif", "log", - "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", "solana-connection-cache", "solana-measure", @@ -6950,12 +7253,12 @@ dependencies = [ [[package]] name = "solana-transaction-dos" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bincode", "clap 2.33.3", "log", - "rand 0.7.3", + "rand 0.8.5", "rayon", "solana-clap-utils", "solana-cli", @@ -6977,10 +7280,10 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.26" +version = "1.17.28" dependencies = [ "Inflector", - "base64 0.21.2", + "base64 0.21.4", "bincode", "borsh 0.10.3", "bs58", @@ -6990,7 +7293,6 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", "solana-sdk", "spl-associated-token-account", "spl-memo", @@ -7000,8 +7302,45 @@ dependencies = [ ] [[package]] +name = "solana-turbine" +version = "1.17.28" +dependencies = [ + "assert_matches", + "bincode", + "bytes", + "crossbeam-channel", + "futures 0.3.28", + "itertools", + "log", + "lru", + "quinn", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rayon", + "rcgen", + "rustls", + "solana-entry", + "solana-gossip", + "solana-ledger", + "solana-logger", + "solana-measure", + "solana-metrics", + "solana-perf", + "solana-poh", + "solana-quic-client", + "solana-rayon-threadlimit", + "solana-rpc", + "solana-rpc-client-api", + "solana-runtime", + "solana-sdk", + "solana-streamer", + "thiserror", + "tokio", +] + +[[package]] name = "solana-udp-client" -version = "1.16.26" +version = "1.17.28" dependencies = [ "async-trait", "solana-connection-cache", @@ -7014,7 +7353,7 @@ dependencies = [ [[package]] name = "solana-upload-perf" -version = "1.16.26" +version = "1.17.28" dependencies = [ "serde_json", "solana-metrics", @@ -7022,7 +7361,7 @@ dependencies = [ [[package]] name = "solana-validator" -version = "1.16.26" +version = "1.17.28" dependencies = [ "chrono", "clap 2.33.3", @@ -7042,13 +7381,14 @@ dependencies = [ "libloading", "log", "num_cpus", - "rand 0.7.3", + "rand 0.8.5", "rayon", "serde", "serde_json", - "serde_yaml 0.9.21", + "serde_yaml 0.9.25", "signal-hook", "solana-account-decoder", + "solana-accounts-db", "solana-clap-utils", "solana-cli-config", "solana-core", @@ -7085,11 +7425,11 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.26" +version = "1.17.28" dependencies = [ "log", "rustc_version 0.4.0", - "semver 1.0.17", + "semver 1.0.20", "serde", "serde_derive", "solana-frozen-abi", @@ -7098,9 +7438,29 @@ dependencies = [ ] [[package]] +name = "solana-vote" +version = "1.17.28" +dependencies = [ + "bincode", + "crossbeam-channel", + "itertools", + "log", + "rand 0.8.5", + "rustc_version 0.4.0", + "serde", + "serde_derive", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", + "solana-vote-program", + "thiserror", +] + +[[package]] name = "solana-vote-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ + "assert_matches", "bincode", "log", "num-derive 0.3.3", @@ -7121,7 +7481,7 @@ dependencies = [ [[package]] name = "solana-watchtower" -version = "1.16.26" +version = "1.17.28" dependencies = [ "clap 2.33.3", "humantime", @@ -7140,7 +7500,7 @@ dependencies = [ [[package]] name = "solana-zk-keygen" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bs58", "clap 3.2.23", @@ -7159,10 +7519,11 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bytemuck", - "getrandom 0.1.16", + "criterion", + "curve25519-dalek", "num-derive 0.3.3", "num-traits", "solana-program-runtime", @@ -7172,7 +7533,7 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program-tests" -version = "1.16.26" +version = "1.17.28" dependencies = [ "bytemuck", "curve25519-dalek", @@ -7184,10 +7545,10 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.26" +version = "1.17.28" dependencies = [ "aes-gcm-siv", - "base64 0.21.2", + "base64 0.21.4", "bincode", "bytemuck", "byteorder", @@ -7212,9 +7573,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", @@ -7254,13 +7615,13 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", "borsh 0.10.3", - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", "solana-program", "spl-token", @@ -7285,9 +7646,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" dependencies = [ - "quote 1.0.28", + "quote", "spl-discriminator-syn", - "syn 2.0.18", + "syn 2.0.38", ] [[package]] @@ -7296,10 +7657,10 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "sha2 0.10.6", - "syn 2.0.18", + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.38", "thiserror", ] @@ -7341,7 +7702,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", "solana-program", "spl-program-error-derive", @@ -7354,17 +7715,17 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "sha2 0.10.6", - "syn 2.0.18", + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.38", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" +checksum = "3f7020347c07892c08560d230fbb8a980316c9e198e22b198b7b9d951ff96047" dependencies = [ "bytemuck", "solana-program", @@ -7391,20 +7752,22 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.9.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.0", + "num-derive 0.4.1", "num-traits", - "num_enum 0.7.0", + "num_enum 0.7.1", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo", "spl-pod", "spl-token", + "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", @@ -7412,6 +7775,19 @@ dependencies = [ ] [[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + +[[package]] name = "spl-token-metadata-interface" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7427,9 +7803,9 @@ dependencies = [ [[package]] name = "spl-transfer-hook-interface" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", @@ -7498,9 +7874,9 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.60", - "quote 1.0.28", + "heck", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -7519,34 +7895,23 @@ checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" [[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.60", - "quote 1.0.28", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.18" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "unicode-ident", ] @@ -7562,10 +7927,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", - "unicode-xid 0.2.2", + "unicode-xid", ] [[package]] @@ -7584,7 +7949,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225e483f02d0ad107168dc57381a8a40c3aeea6abe47f37506931f861643cfa8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "thiserror", @@ -7592,6 +7957,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "systemstat" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7601,15 +7987,15 @@ dependencies = [ "lazy_static", "libc", "nom", - "time 0.3.9", + "time", "winapi 0.3.9", ] [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -7646,22 +8032,22 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -7681,24 +8067,37 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-case" -version = "2.2.2" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" +checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" dependencies = [ "test-case-macros", ] [[package]] -name = "test-case-macros" -version = "2.2.2" +name = "test-case-core" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" +checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" dependencies = [ "cfg-if 1.0.0", "proc-macro-error", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "test-case-macros" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.38", + "test-case-core", ] [[package]] @@ -7718,22 +8117,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -7774,16 +8173,6 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" @@ -7820,6 +8209,16 @@ dependencies = [ ] [[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "tinyvec" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7836,22 +8235,21 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" +version = "1.29.1" +source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", - "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", + "socket2 0.4.9", "tokio-macros", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -7866,13 +8264,12 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +version = "2.1.0" +source = "git+https://github.com/solana-labs/solana-tokio.git?rev=7cf47705faacf7bf0e43e4131a5377b3291fce21#7cf47705faacf7bf0e43e4131a5377b3291fce21" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -7887,24 +8284,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.19.1", + "rustls", "tokio", - "webpki 0.21.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki 0.22.0", ] [[package]] @@ -7925,9 +8310,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -7936,18 +8321,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.20.8", + "rustls", "tokio", - "tokio-rustls 0.23.3", + "tokio-rustls", "tungstenite", - "webpki 0.22.0", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] @@ -7991,46 +8375,14 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding 2.2.0", - "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", - "tokio", - "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util 0.6.9", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.13.1", + "base64 0.21.4", "bytes", "futures-core", "futures-util", @@ -8039,44 +8391,29 @@ dependencies = [ "http-body", "hyper", "hyper-timeout", - "percent-encoding 2.2.0", + "percent-encoding 2.3.0", "pin-project", - "prost 0.11.9", - "prost-derive 0.11.9", + "prost", "rustls-pemfile 1.0.0", "tokio", - "tokio-rustls 0.23.3", + "tokio-rustls", "tokio-stream", - "tokio-util 0.7.1", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2 1.0.60", - "prost-build 0.9.0", - "quote 1.0.28", - "syn 1.0.109", ] [[package]] name = "tonic-build" -version = "0.8.4" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.9", - "proc-macro2 1.0.60", - "prost-build 0.11.4", - "quote 1.0.28", + "proc-macro2", + "prost-build", + "quote", "syn 1.0.109", ] @@ -8088,7 +8425,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand 0.8.5", @@ -8101,25 +8438,6 @@ dependencies = [ ] [[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] name = "tower-layer" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8127,17 +8445,16 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -8146,32 +8463,23 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", + "once_cell", + "valuable", ] [[package]] @@ -8211,24 +8519,23 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand 0.8.5", - "rustls 0.20.8", - "sha-1 0.10.0", + "rustls", + "sha1", "thiserror", - "url 2.3.1", + "url 2.4.1", "utf-8", - "webpki 0.22.0", - "webpki-roots", + "webpki-roots 0.24.0", ] [[package]] @@ -8260,9 +8567,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -8272,20 +8579,14 @@ checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] name = "unicode-width" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8293,12 +8594,6 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[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.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" @@ -8357,13 +8652,13 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.3.0", - "percent-encoding 2.2.0", + "idna 0.4.0", + "percent-encoding 2.3.0", ] [[package]] @@ -8379,6 +8674,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" [[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" @@ -8446,9 +8747,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -8456,16 +8757,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -8483,32 +8784,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.28", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 2.0.18", + "proc-macro2", + "quote", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" @@ -8521,33 +8822,19 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.21.4" +name = "webpki-roots" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", + "rustls-webpki", ] [[package]] name = "webpki-roots" -version = "0.22.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" -dependencies = [ - "webpki 0.22.0", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" @@ -8605,34 +8892,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -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-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" @@ -8693,12 +8952,6 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" @@ -8711,12 +8964,6 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" @@ -8729,12 +8976,6 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" @@ -8747,12 +8988,6 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" @@ -8777,12 +9012,6 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" @@ -8795,11 +9024,12 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -8817,14 +9047,14 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.9", + "time", ] [[package]] name = "xattr" -version = "0.2.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] @@ -8844,7 +9074,27 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" dependencies = [ - "time 0.3.9", + "time", +] + +[[package]] +name = "zerocopy" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] @@ -8858,14 +9108,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.60", - "quote 1.0.28", - "syn 1.0.109", - "synstructure", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index d2efa4633a646..56f38c49b12a3 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -60,20 +60,11 @@ rustPlatform.buildRustPackage rec { inherit hash; }; - # fix build with rust 1.70+ - patches = [ - (fetchpatch { - url = "https://github.com/solana-labs/solana/commit/9e703f85de4184f577f22a1c72a0d33612f2feb1.patch"; - hash = "sha256-bAKTIQ6FhTk6bIddYULwLfdH5kzNPw1ltXJEfawtAXg="; - includes = [ "sdk/program/src/account_info.rs" ]; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws="; - "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; + "tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk="; }; }; diff --git a/pkgs/applications/blockchains/solana-validator/pin.json b/pkgs/applications/blockchains/solana-validator/pin.json index b61d08c1d7155..ba22a0f7baf90 100644 --- a/pkgs/applications/blockchains/solana-validator/pin.json +++ b/pkgs/applications/blockchains/solana-validator/pin.json @@ -1,4 +1,4 @@ { - "version": "1.16.26", - "hash": "sha256-0OMZO2aKoaeRCkswXDXV9Y6HnYLzpkqqFPVIW2P5TwE=" + "version": "1.17.28", + "hash": "sha256-y79zsUfYsX377ofsFSg9a2il99uJsA+qdCu3J+EU5nQ=" } diff --git a/pkgs/applications/blockchains/solana/Cargo.lock b/pkgs/applications/blockchains/solana/Cargo.lock deleted file mode 100644 index de1799d5d416d..0000000000000 --- a/pkgs/applications/blockchains/solana/Cargo.lock +++ /dev/null @@ -1,8919 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array 0.14.7", -] - -[[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 0.3.0", -] - -[[package]] -name = "aes-gcm-siv" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "polyval", - "subtle", - "zeroize", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.8", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" -dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.8", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android_system_properties" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "arc-swap" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" - -[[package]] -name = "ark-bn254" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - -[[package]] -name = "ark-ec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" -dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", - "itertools", - "num-traits", - "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", - "ark-ff-macros", - "ark-serialize", - "ark-std", - "derivative", - "digest 0.10.7", - "itertools", - "num-bigint 0.4.3", - "num-traits", - "paste", - "rustc_version 0.4.0", - "zeroize", -] - -[[package]] -name = "ark-ff-asm" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" -dependencies = [ - "quote 1.0.28", - "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 0.4.3", - "num-traits", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "ark-poly" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" -dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", - "derivative", - "hashbrown 0.13.2", -] - -[[package]] -name = "ark-serialize" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" -dependencies = [ - "ark-serialize-derive", - "ark-std", - "digest 0.10.7", - "num-bigint 0.4.3", -] - -[[package]] -name = "ark-serialize-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "ark-std" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "array-bytes" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time 0.3.9", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "assert_cmd" -version = "2.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" -dependencies = [ - "bstr 1.4.0", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[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-compression" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-stream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[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 = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "autotools" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" -dependencies = [ - "cc", -] - -[[package]] -name = "axum" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" -dependencies = [ - "async-trait", - "axum-core", - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding 2.2.0", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.8", - "instant", - "pin-project-lite", - "rand 0.8.5", - "tokio", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64ct" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874f8444adcb4952a8bc51305c8be95c8ec8237bb0d2e78d2e039f771f8828a0" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[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", - "peeking_take_while", - "prettyplease 0.2.4", - "proc-macro2 1.0.76", - "quote 1.0.28", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.43", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - -[[package]] -name = "blake3" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if 1.0.0", - "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding 0.2.1", - "generic-array 0.14.7", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - -[[package]] -name = "borsh" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" -dependencies = [ - "borsh-derive 0.10.3", - "hashbrown 0.13.2", -] - -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.76", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal 0.10.3", - "borsh-schema-derive-internal 0.10.3", - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.76", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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 = "bs58" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bstr" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" -dependencies = [ - "memchr", - "once_cell", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bv" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8834bb1d8ee5dc048ee3124f2c7c1afcc6bc9aed03f11e9dfd8c69470a5db340" -dependencies = [ - "feature-probe", - "serde", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - -[[package]] -name = "byte-unit" -version = "4.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" -dependencies = [ - "serde", - "utf8-width", -] - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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 = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[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 = "camino" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" -dependencies = [ - "serde", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.17", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cast" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version 0.4.0", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[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", - "serde", - "time 0.1.43", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "chrono-humanize" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32dce1ea1988dbdf9f9815ff11425828523bd2a134ec0805d2ac8af26ee6096e" -dependencies = [ - "chrono", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "clang-sys" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[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 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck 0.4.0", - "proc-macro-error", - "proc-macro2 1.0.76", - "quote 1.0.28", - "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 = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - -[[package]] -name = "concurrent-queue" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[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 = "console_log" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f" -dependencies = [ - "log", - "web-sys", -] - -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "const_format" -version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "unicode-xid 0.2.2", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" -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_affinity" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f" -dependencies = [ - "kernel32-sys", - "libc", - "num_cpus", - "winapi 0.2.8", -] - -[[package]] -name = "cpufeatures" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "criterion-stats" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387df94cb74ada1b33e10ce034bb0d9360cc73edb5063e7d7d4120a40ee1c9d2" -dependencies = [ - "cast", - "num-traits", - "num_cpus", - "rand 0.4.6", - "thread-scoped", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.5" -source = "git+https://github.com/solana-labs/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", - "lazy_static", - "memoffset 0.6.4", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" -dependencies = [ - "generic-array 0.14.7", - "typenum", -] - -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - -[[package]] -name = "csv" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "ctrlc" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7394a21d012ce5c850497fb774b167d81b99f060025fbf06ee92b9848bd97eb2" -dependencies = [ - "nix", - "windows-sys 0.48.0", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "darling" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.76", - "quote 1.0.28", - "strsim 0.10.0", - "syn 2.0.43", -] - -[[package]] -name = "darling_macro" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" -dependencies = [ - "darling_core", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", - "rayon", -] - -[[package]] -name = "dashmap" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8858831f7781322e539ea39e72449c46b059638250c14344fec8d0aa6e539c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", - "parking_lot 0.12.1", -] - -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - -[[package]] -name = "der" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.3", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "derivation-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" -dependencies = [ - "convert_case", - "proc-macro2 1.0.76", - "quote 1.0.28", - "rustc_version 0.3.3", - "syn 1.0.109", -] - -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.7", -] - -[[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", - "crypto-common", - "subtle", -] - -[[package]] -name = "dir-diff" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" -dependencies = [ - "walkdir", -] - -[[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-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 = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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 = "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 = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "eager" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" - -[[package]] -name = "ed25519" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-dalek-bip32" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" -dependencies = [ - "derivation-path", - "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.6", -] - -[[package]] -name = "educe" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" -dependencies = [ - "enum-ordinalize", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "enum-ordinalize" -version = "3.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" -dependencies = [ - "num-bigint 0.4.3", - "num-traits", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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 = "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 = "etcd-client" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3bfae4cb9cd8c3c2a552d45e155cafd079f385a3b9421b9a010878f44531f1e" -dependencies = [ - "http", - "prost 0.9.0", - "tokio", - "tokio-stream", - "tonic 0.6.2", - "tonic-build 0.6.2", - "tower-service", -] - -[[package]] -name = "event-listener" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" - -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - -[[package]] -name = "fast-math" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2465292146cdfc2011350fe3b1c616ac83cf0faeedb33463ba1c332ed8948d66" -dependencies = [ - "ieee754", -] - -[[package]] -name = "fastrand" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -dependencies = [ - "instant", -] - -[[package]] -name = "fd-lock" -version = "3.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "feature-probe" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" - -[[package]] -name = "filedescriptor" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed3d8a5e20435ff00469e51a0d82049bae66504b5c429920dadf9bb54d47b3f" -dependencies = [ - "libc", - "thiserror", - "winapi 0.3.9", -] - -[[package]] -name = "filetime" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.10", - "winapi 0.3.9", -] - -[[package]] -name = "fixedbitset" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -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 = "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 = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[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", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[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 0.1.31", - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gag" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" -dependencies = [ - "filedescriptor", - "tempfile", -] - -[[package]] -name = "gdbstub" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c95766e0414f8bfc1d07055574c621b67739466d6ba516c4fef8e99d30d2e6" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "log", - "managed", - "num-traits", - "paste", -] - -[[package]] -name = "gen-headers" -version = "1.16.27" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "gen-syscall-list" -version = "1.16.27" -dependencies = [ - "regex", -] - -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "serde", - "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.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" -dependencies = [ - "aho-corasick 0.7.18", - "bstr 0.2.17", - "fnv", - "log", - "regex", -] - -[[package]] -name = "goauth" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" -dependencies = [ - "arc-swap", - "futures 0.3.28", - "log", - "reqwest", - "serde", - "serde_derive", - "serde_json", - "simpl", - "smpl_jwt", - "time 0.3.9", - "tokio", -] - -[[package]] -name = "goblin" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c955ab4e0ad8c843ea653a3d143048b87490d9be56bd7132a435c2407846ac8f" -dependencies = [ - "log", - "plain", - "scroll", -] - -[[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 0.7.1", - "tracing", -] - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.4", -] - -[[package]] -name = "headers" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d" -dependencies = [ - "base64 0.13.1", - "bitflags", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha-1 0.10.0", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - -[[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.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 = "hidapi" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f841dbb77615e116fb2ca38044b42310370f0d093c774a72361670ff2ae431b" -dependencies = [ - "cc", - "libc", - "pkg-config", - "winapi 0.3.9", -] - -[[package]] -name = "histogram" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.7", - "hmac 0.8.1", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -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", -] - -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-proxy" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" -dependencies = [ - "bytes", - "futures 0.3.28", - "headers", - "http", - "hyper", - "hyper-tls", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -dependencies = [ - "http", - "hyper", - "rustls 0.20.8", - "tokio", - "tokio-rustls 0.23.3", -] - -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - -[[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.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2bfd338099682614d3ee3fe0cd72e0b6a41ca6a87f6a74a3bd593c91650501" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[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.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.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ieee754" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" - -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "index_list" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" - -[[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", - "rayon", -] - -[[package]] -name = "indicatif" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[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.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json5" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" -dependencies = [ - "pest", - "pest_derive", - "serde", -] - -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.28", - "jsonrpc-core", - "jsonrpc-pubsub", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "serde", - "serde_json", - "tokio", - "url 1.7.2", -] - -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.28", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.28", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.28", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.28", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.28", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes", - "futures 0.3.28", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.9", - "unicase", -] - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[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 = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[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 = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - -[[package]] -name = "librocksdb-sys" -version = "0.11.0+8.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", - "lz4-sys", -] - -[[package]] -name = "libsecp256k1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" -dependencies = [ - "arrayref", - "base64 0.12.3", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libz-sys" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" - -[[package]] -name = "linux-raw-sys" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -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 = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] - -[[package]] -name = "lz4" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "managed" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "min-max-heap" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18" - -[[package]] -name = "minimal-lexical" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c64630dcdd71f1a64c435f54885086a0de5d6a12d104d69b165fb7d5286d677" - -[[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.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[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.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[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", - "pin-utils", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" -dependencies = [ - "memchr", - "minimal-lexical", - "version_check", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "git+https://github.com/solana-labs/ntapi?rev=97ede981a1777883ff86d142b75024b023f04fad#97ede981a1777883ff86d142b75024b023f04fad" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint 0.2.6", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[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.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -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-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "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", - "libm", -] - -[[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 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - -[[package]] -name = "num_enum" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" -dependencies = [ - "num_enum_derive 0.7.0", -] - -[[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.1.0", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "num_threads" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "oid-registry" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4bda43fd1b844cbc6e6e54b5444e2b1bc7838bce59ad205902cccbb26d6761" -dependencies = [ - "asn1-rs", -] - -[[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.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "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 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - -[[package]] -name = "openssl-src" -version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4026ef4fae4cd0c85aee4846e497cea7855659077108067c0d37c0d628f3e40a" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "opentelemetry" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding 2.2.0", - "pin-project", - "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "os_str_bytes" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" - -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.28", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[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 0.9.1", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.10", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.10", - "smallvec", - "windows-sys 0.32.0", -] - -[[package]] -name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[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 = "percentage" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" -dependencies = [ - "num", -] - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1 0.8.2", -] - -[[package]] -name = "petgraph" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pickledb" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53a5ade47760e8cc4986bdc5e72daeffaaaee64cbc374f9cfe0a00c1cd87b1f" -dependencies = [ - "serde", - "serde_yaml 0.8.26", -] - -[[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.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - -[[package]] -name = "pkg-config" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" - -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" - -[[package]] -name = "ppv-lite86" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" - -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - -[[package]] -name = "predicates-tree" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "prettyplease" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" -dependencies = [ - "proc-macro2 1.0.76", - "syn 1.0.109", -] - -[[package]] -name = "prettyplease" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" -dependencies = [ - "proc-macro2 1.0.76", - "syn 2.0.43", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" -dependencies = [ - "thiserror", - "toml", -] - -[[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.76", - "quote 1.0.28", - "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.76", - "quote 1.0.28", - "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.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" -dependencies = [ - "bit-set", - "bitflags", - "byteorder", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax 0.6.29", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", -] - -[[package]] -name = "prost-build" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" -dependencies = [ - "bytes", - "heck 0.4.0", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease 0.1.9", - "prost 0.11.9", - "prost-types 0.11.9", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", -] - -[[package]] -name = "proto" -version = "1.16.27" -dependencies = [ - "protobuf-src", - "tonic-build 0.8.4", -] - -[[package]] -name = "protobuf-src" -version = "1.1.0+21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" -dependencies = [ - "autotools", -] - -[[package]] -name = "qstring" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" -dependencies = [ - "percent-encoding 2.2.0", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quinn" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.20.8", - "thiserror", - "tokio", - "tracing", - "webpki 0.22.0", -] - -[[package]] -name = "quinn-proto" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki 0.22.0", -] - -[[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", - "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.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -dependencies = [ - "proc-macro2 1.0.76", -] - -[[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 0.3.9", -] - -[[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", -] - -[[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.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_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "raptorq" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b020bbf5c89791160a30f0d4706d8ec7aa5718d6a198f6df19c400e4f4470" - -[[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 = "rbpf-cli" -version = "1.16.27" - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time 0.3.9", - "yasna", -] - -[[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.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall 0.2.10", -] - -[[package]] -name = "reed-solomon-erasure" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" -dependencies = [ - "cc", - "libc", - "libm", - "lru", - "parking_lot 0.11.2", - "smallvec", - "spin 0.9.2", -] - -[[package]] -name = "regex" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" -dependencies = [ - "aho-corasick 1.0.1", - "memchr", - "regex-syntax 0.7.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "reqwest" -version = "0.11.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" -dependencies = [ - "async-compression", - "base64 0.21.2", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding 2.2.0", - "pin-project-lite", - "rustls 0.20.8", - "rustls-pemfile 1.0.0", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.23.3", - "tokio-util 0.7.1", - "tower-service", - "url 2.3.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[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 = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "rolling-file" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8395b4f860856b740f20a296ea2cd4d823e81a2658cf05ef61be22916026a906" -dependencies = [ - "chrono", -] - -[[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 = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[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.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.17", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.37.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" -dependencies = [ - "openssl-probe", - "rustls-pemfile 0.2.1", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[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 = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - -[[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.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[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.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -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.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -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.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "serde", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "serial_test" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" -dependencies = [ - "dashmap 5.2.0", - "futures 0.3.28", - "lazy_static", - "log", - "parking_lot 0.12.1", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - -[[package]] -name = "sha-1" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" -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 0.3.0", -] - -[[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 0.10.7", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug 0.3.0", -] - -[[package]] -name = "sha3" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56" -dependencies = [ - "digest 0.10.7", - "keccak", -] - -[[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 = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" - -[[package]] -name = "simpl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" - -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - -[[package]] -name = "slab" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" - -[[package]] -name = "smallvec" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" - -[[package]] -name = "smpl_jwt" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" -dependencies = [ - "base64 0.13.1", - "log", - "openssl", - "serde", - "serde_derive", - "serde_json", - "simpl", - "time 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 = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.1", - "bytes", - "futures 0.3.28", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", -] - -[[package]] -name = "solana-account-decoder" -version = "1.16.27" -dependencies = [ - "Inflector", - "base64 0.21.2", - "bincode", - "bs58", - "bv", - "lazy_static", - "serde", - "serde_derive", - "serde_json", - "solana-address-lookup-table-program", - "solana-config-program", - "solana-sdk", - "spl-pod", - "spl-token", - "spl-token-2022", - "spl-token-metadata-interface", - "thiserror", - "zstd", -] - -[[package]] -name = "solana-accounts-bench" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "log", - "rayon", - "solana-logger", - "solana-measure", - "solana-runtime", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-accounts-cluster-bench" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "log", - "rand 0.7.3", - "rayon", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "spl-token", -] - -[[package]] -name = "solana-address-lookup-table-program" -version = "1.16.27" -dependencies = [ - "bincode", - "bytemuck", - "log", - "num-derive 0.3.3", - "num-traits", - "rustc_version 0.4.0", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", -] - -[[package]] -name = "solana-address-lookup-table-program-tests" -version = "1.16.27" -dependencies = [ - "assert_matches", - "bincode", - "solana-address-lookup-table-program", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-banking-bench" -version = "1.16.27" -dependencies = [ - "clap 3.2.23", - "crossbeam-channel", - "log", - "rand 0.7.3", - "rayon", - "solana-client", - "solana-core", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-perf", - "solana-poh", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-tpu-client", - "solana-version", -] - -[[package]] -name = "solana-banks-client" -version = "1.16.27" -dependencies = [ - "borsh 0.10.3", - "futures 0.3.28", - "solana-banks-interface", - "solana-banks-server", - "solana-program", - "solana-runtime", - "solana-sdk", - "tarpc", - "thiserror", - "tokio", - "tokio-serde", -] - -[[package]] -name = "solana-banks-interface" -version = "1.16.27" -dependencies = [ - "serde", - "solana-sdk", - "tarpc", -] - -[[package]] -name = "solana-banks-server" -version = "1.16.27" -dependencies = [ - "bincode", - "crossbeam-channel", - "futures 0.3.28", - "solana-banks-interface", - "solana-client", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "tarpc", - "tokio", - "tokio-serde", -] - -[[package]] -name = "solana-bench-streamer" -version = "1.16.27" -dependencies = [ - "clap 3.2.23", - "crossbeam-channel", - "solana-net-utils", - "solana-streamer", - "solana-version", -] - -[[package]] -name = "solana-bench-tps" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "crossbeam-channel", - "log", - "rand 0.7.3", - "rayon", - "serde_json", - "serde_yaml 0.9.21", - "serial_test", - "solana-clap-utils", - "solana-cli-config", - "solana-client", - "solana-connection-cache", - "solana-core", - "solana-faucet", - "solana-genesis", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-thin-client", - "solana-tpu-client", - "solana-version", - "spl-instruction-padding", - "tempfile", - "thiserror", -] - -[[package]] -name = "solana-bloom" -version = "1.16.27" -dependencies = [ - "bv", - "fnv", - "log", - "rand 0.7.3", - "rayon", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", -] - -[[package]] -name = "solana-bpf-loader-program" -version = "1.16.27" -dependencies = [ - "bincode", - "byteorder", - "libsecp256k1", - "log", - "memoffset 0.9.0", - "rand 0.7.3", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", - "solana_rbpf", - "thiserror", -] - -[[package]] -name = "solana-bpf-loader-program-tests" -version = "1.16.27" -dependencies = [ - "assert_matches", - "bincode", - "solana-bpf-loader-program", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-bucket-map" -version = "1.16.27" -dependencies = [ - "bv", - "fs_extra", - "log", - "memmap2", - "modular-bitfield", - "num_enum 0.6.1", - "rand 0.7.3", - "rayon", - "solana-logger", - "solana-measure", - "solana-sdk", - "tempfile", -] - -[[package]] -name = "solana-cargo-build-bpf" -version = "1.16.27" -dependencies = [ - "cargo_metadata", - "clap 3.2.23", - "log", - "solana-logger", - "solana-sdk", -] - -[[package]] -name = "solana-cargo-build-sbf" -version = "1.16.27" -dependencies = [ - "assert_cmd", - "bzip2", - "cargo_metadata", - "clap 3.2.23", - "log", - "predicates", - "regex", - "reqwest", - "semver 1.0.17", - "serial_test", - "solana-download-utils", - "solana-logger", - "solana-sdk", - "tar", -] - -[[package]] -name = "solana-cargo-test-bpf" -version = "1.16.27" -dependencies = [ - "cargo_metadata", - "clap 3.2.23", -] - -[[package]] -name = "solana-cargo-test-sbf" -version = "1.16.27" -dependencies = [ - "cargo_metadata", - "clap 3.2.23", - "log", - "solana-logger", -] - -[[package]] -name = "solana-clap-utils" -version = "1.16.27" -dependencies = [ - "chrono", - "clap 2.33.3", - "rpassword", - "solana-perf", - "solana-remote-wallet", - "solana-sdk", - "tempfile", - "thiserror", - "tiny-bip39", - "uriparse", - "url 2.3.1", -] - -[[package]] -name = "solana-clap-v3-utils" -version = "1.16.27" -dependencies = [ - "chrono", - "clap 3.2.23", - "rpassword", - "solana-perf", - "solana-remote-wallet", - "solana-sdk", - "solana-zk-token-sdk", - "tempfile", - "thiserror", - "tiny-bip39", - "uriparse", - "url 2.3.1", -] - -[[package]] -name = "solana-cli" -version = "1.16.27" -dependencies = [ - "bincode", - "bs58", - "clap 2.33.3", - "console", - "const_format", - "criterion-stats", - "crossbeam-channel", - "ctrlc", - "hex", - "humantime", - "log", - "num-traits", - "pretty-hex", - "reqwest", - "semver 1.0.17", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-clap-utils", - "solana-cli-config", - "solana-cli-output", - "solana-client", - "solana-config-program", - "solana-faucet", - "solana-logger", - "solana-program-runtime", - "solana-pubsub-client", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "solana_rbpf", - "spl-memo", - "tempfile", - "thiserror", - "tiny-bip39", -] - -[[package]] -name = "solana-cli-config" -version = "1.16.27" -dependencies = [ - "anyhow", - "dirs-next", - "lazy_static", - "serde", - "serde_derive", - "serde_yaml 0.9.21", - "solana-clap-utils", - "solana-sdk", - "url 2.3.1", -] - -[[package]] -name = "solana-cli-output" -version = "1.16.27" -dependencies = [ - "Inflector", - "base64 0.21.2", - "chrono", - "clap 2.33.3", - "console", - "ed25519-dalek", - "humantime", - "indicatif", - "pretty-hex", - "semver 1.0.17", - "serde", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-vote-program", - "spl-memo", -] - -[[package]] -name = "solana-client" -version = "1.16.27" -dependencies = [ - "async-trait", - "bincode", - "crossbeam-channel", - "futures 0.3.28", - "futures-util", - "indexmap", - "indicatif", - "log", - "quinn", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-quic-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-udp-client", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-client-test" -version = "1.16.27" -dependencies = [ - "futures-util", - "serde_json", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-pubsub-client", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "systemstat", - "tokio", - "tungstenite", -] - -[[package]] -name = "solana-compute-budget-program" -version = "1.16.27" -dependencies = [ - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-config-program" -version = "1.16.27" -dependencies = [ - "bincode", - "chrono", - "serde", - "serde_derive", - "solana-logger", - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-connection-cache" -version = "1.16.27" -dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap", - "indicatif", - "log", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "rcgen", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-core" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bincode", - "bs58", - "chrono", - "crossbeam-channel", - "dashmap 4.0.2", - "eager", - "etcd-client", - "fs_extra", - "histogram", - "itertools", - "lazy_static", - "log", - "lru", - "matches", - "min-max-heap", - "num_enum 0.6.1", - "rand 0.7.3", - "rand_chacha 0.2.2", - "raptorq", - "rayon", - "rolling-file", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "serde_json", - "serial_test", - "solana-address-lookup-table-program", - "solana-bloom", - "solana-client", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-rpc", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-stake-program", - "solana-streamer", - "solana-tpu-client", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "static_assertions", - "strum", - "strum_macros", - "sys-info", - "sysctl", - "systemstat", - "tempfile", - "test-case", - "thiserror", - "tokio", - "trees", -] - -[[package]] -name = "solana-dos" -version = "1.16.27" -dependencies = [ - "bincode", - "clap 3.2.23", - "crossbeam-channel", - "itertools", - "log", - "rand 0.7.3", - "serde", - "solana-bench-tps", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-perf", - "solana-rpc", - "solana-rpc-client", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-version", -] - -[[package]] -name = "solana-download-utils" -version = "1.16.27" -dependencies = [ - "console", - "indicatif", - "log", - "reqwest", - "solana-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-ed25519-program-tests" -version = "1.16.27" -dependencies = [ - "assert_matches", - "ed25519-dalek", - "rand 0.7.3", - "solana-program-test", - "solana-sdk", -] - -[[package]] -name = "solana-entry" -version = "1.16.27" -dependencies = [ - "bincode", - "crossbeam-channel", - "dlopen", - "dlopen_derive", - "lazy_static", - "log", - "matches", - "rand 0.7.3", - "rayon", - "serde", - "solana-logger", - "solana-measure", - "solana-merkle-tree", - "solana-metrics", - "solana-perf", - "solana-rayon-threadlimit", - "solana-sdk", -] - -[[package]] -name = "solana-faucet" -version = "1.16.27" -dependencies = [ - "bincode", - "byteorder", - "clap 2.33.3", - "crossbeam-channel", - "log", - "serde", - "serde_derive", - "solana-clap-utils", - "solana-cli-config", - "solana-logger", - "solana-metrics", - "solana-sdk", - "solana-version", - "spl-memo", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-frozen-abi" -version = "1.16.27" -dependencies = [ - "ahash 0.8.4", - "blake3", - "block-buffer 0.10.4", - "bs58", - "bv", - "byteorder", - "cc", - "either", - "generic-array 0.14.7", - "getrandom 0.1.16", - "im", - "lazy_static", - "log", - "memmap2", - "once_cell", - "rand_core 0.6.4", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.6", - "solana-frozen-abi-macro", - "solana-logger", - "subtle", - "thiserror", -] - -[[package]] -name = "solana-frozen-abi-macro" -version = "1.16.27" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "rustc_version 0.4.0", - "syn 2.0.43", -] - -[[package]] -name = "solana-genesis" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bincode", - "clap 2.33.3", - "itertools", - "serde", - "serde_json", - "serde_yaml 0.9.21", - "solana-clap-utils", - "solana-cli-config", - "solana-entry", - "solana-ledger", - "solana-logger", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-version", - "solana-vote-program", - "tempfile", -] - -[[package]] -name = "solana-genesis-utils" -version = "1.16.27" -dependencies = [ - "log", - "solana-download-utils", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-geyser-plugin-interface" -version = "1.16.27" -dependencies = [ - "log", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - -[[package]] -name = "solana-geyser-plugin-manager" -version = "1.16.27" -dependencies = [ - "bs58", - "crossbeam-channel", - "json5", - "jsonrpc-core", - "jsonrpc-server-utils", - "libloading", - "log", - "serde_json", - "solana-entry", - "solana-geyser-plugin-interface", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-transaction-status", - "thiserror", -] - -[[package]] -name = "solana-gossip" -version = "1.16.27" -dependencies = [ - "bincode", - "bv", - "clap 2.33.3", - "crossbeam-channel", - "flate2", - "indexmap", - "itertools", - "log", - "lru", - "matches", - "num-traits", - "num_cpus", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "regex", - "rustc_version 0.4.0", - "serde", - "serde_bytes", - "serde_derive", - "serial_test", - "solana-bloom", - "solana-clap-utils", - "solana-client", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-version", - "solana-vote-program", - "static_assertions", - "thiserror", -] - -[[package]] -name = "solana-install" -version = "1.16.27" -dependencies = [ - "atty", - "bincode", - "bzip2", - "chrono", - "clap 2.33.3", - "console", - "crossbeam-channel", - "ctrlc", - "dirs-next", - "indicatif", - "lazy_static", - "nix", - "reqwest", - "scopeguard", - "semver 1.0.17", - "serde", - "serde_yaml 0.8.26", - "serde_yaml 0.9.21", - "solana-clap-utils", - "solana-config-program", - "solana-logger", - "solana-rpc-client", - "solana-sdk", - "solana-version", - "tar", - "tempfile", - "url 2.3.1", - "winapi 0.3.9", - "winreg", -] - -[[package]] -name = "solana-keygen" -version = "1.16.27" -dependencies = [ - "bs58", - "clap 3.2.23", - "dirs-next", - "num_cpus", - "solana-clap-v3-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-sdk", - "solana-version", - "tempfile", - "tiny-bip39", -] - -[[package]] -name = "solana-ledger" -version = "1.16.27" -dependencies = [ - "assert_matches", - "bincode", - "bitflags", - "bs58", - "byteorder", - "chrono", - "chrono-humanize", - "crossbeam-channel", - "dashmap 4.0.2", - "fs_extra", - "futures 0.3.28", - "itertools", - "lazy_static", - "libc", - "log", - "lru", - "matches", - "num_cpus", - "num_enum 0.6.1", - "prost 0.11.9", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "reed-solomon-erasure", - "rocksdb", - "rustc_version 0.4.0", - "scopeguard", - "serde", - "serde_bytes", - "sha2 0.10.6", - "solana-account-decoder", - "solana-bpf-loader-program", - "solana-entry", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-storage-bigtable", - "solana-storage-proto", - "solana-transaction-status", - "solana-vote-program", - "spl-pod", - "spl-token", - "spl-token-2022", - "static_assertions", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tokio-stream", - "trees", -] - -[[package]] -name = "solana-ledger-tool" -version = "1.16.27" -dependencies = [ - "assert_cmd", - "bs58", - "bytecount", - "chrono", - "clap 2.33.3", - "crossbeam-channel", - "csv", - "dashmap 4.0.2", - "futures 0.3.28", - "histogram", - "itertools", - "log", - "num_cpus", - "regex", - "serde", - "serde_json", - "signal-hook", - "solana-account-decoder", - "solana-bpf-loader-program", - "solana-clap-utils", - "solana-cli-output", - "solana-core", - "solana-entry", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-program-runtime", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-storage-bigtable", - "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "solana_rbpf", - "tikv-jemallocator", - "tokio", -] - -[[package]] -name = "solana-loader-v4-program" -version = "1.16.27" -dependencies = [ - "bincode", - "log", - "rand 0.7.3", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana_rbpf", -] - -[[package]] -name = "solana-local-cluster" -version = "1.16.27" -dependencies = [ - "assert_matches", - "crossbeam-channel", - "fs_extra", - "gag", - "itertools", - "log", - "rand 0.7.3", - "rayon", - "serial_test", - "solana-client", - "solana-config-program", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-vote-program", - "tempfile", - "trees", -] - -[[package]] -name = "solana-log-analyzer" -version = "1.16.27" -dependencies = [ - "byte-unit", - "clap 3.2.23", - "serde", - "serde_json", - "solana-logger", - "solana-version", -] - -[[package]] -name = "solana-logger" -version = "1.16.27" -dependencies = [ - "env_logger", - "lazy_static", - "log", -] - -[[package]] -name = "solana-measure" -version = "1.16.27" -dependencies = [ - "log", - "solana-sdk", -] - -[[package]] -name = "solana-memory-management" -version = "1.16.27" - -[[package]] -name = "solana-merkle-root-bench" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "log", - "solana-logger", - "solana-measure", - "solana-runtime", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-merkle-tree" -version = "1.16.27" -dependencies = [ - "fast-math", - "hex", - "matches", - "solana-program", -] - -[[package]] -name = "solana-metrics" -version = "1.16.27" -dependencies = [ - "crossbeam-channel", - "env_logger", - "gethostname", - "lazy_static", - "log", - "rand 0.7.3", - "reqwest", - "serial_test", - "solana-sdk", -] - -[[package]] -name = "solana-net-shaper" -version = "1.16.27" -dependencies = [ - "clap 3.2.23", - "rand 0.7.3", - "serde", - "serde_json", - "solana-logger", -] - -[[package]] -name = "solana-net-utils" -version = "1.16.27" -dependencies = [ - "bincode", - "clap 3.2.23", - "crossbeam-channel", - "log", - "nix", - "rand 0.7.3", - "serde", - "serde_derive", - "socket2", - "solana-logger", - "solana-sdk", - "solana-version", - "tokio", - "url 2.3.1", -] - -[[package]] -name = "solana-notifier" -version = "1.16.27" -dependencies = [ - "log", - "reqwest", - "serde_json", - "solana-sdk", -] - -[[package]] -name = "solana-perf" -version = "1.16.27" -dependencies = [ - "ahash 0.8.4", - "bincode", - "bv", - "caps", - "curve25519-dalek", - "dlopen", - "dlopen_derive", - "fnv", - "lazy_static", - "libc", - "log", - "matches", - "nix", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "serde", - "solana-logger", - "solana-metrics", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", - "test-case", -] - -[[package]] -name = "solana-poh" -version = "1.16.27" -dependencies = [ - "bincode", - "core_affinity", - "crossbeam-channel", - "log", - "matches", - "rand 0.7.3", - "solana-entry", - "solana-ledger", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-runtime", - "solana-sdk", - "thiserror", -] - -[[package]] -name = "solana-poh-bench" -version = "1.16.27" -dependencies = [ - "clap 3.2.23", - "log", - "rand 0.7.3", - "rayon", - "solana-entry", - "solana-logger", - "solana-measure", - "solana-perf", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-program" -version = "1.16.27" -dependencies = [ - "anyhow", - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "array-bytes", - "assert_matches", - "base64 0.21.2", - "bincode", - "bitflags", - "blake3", - "borsh 0.10.3", - "borsh 0.9.3", - "bs58", - "bv", - "bytemuck", - "cc", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.8", - "itertools", - "js-sys", - "lazy_static", - "libc", - "libsecp256k1", - "log", - "memoffset 0.9.0", - "num-bigint 0.4.3", - "num-derive 0.3.3", - "num-traits", - "parking_lot 0.12.1", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "sha2 0.10.6", - "sha3 0.10.4", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-sdk-macro", - "static_assertions", - "thiserror", - "tiny-bip39", - "wasm-bindgen", - "zeroize", -] - -[[package]] -name = "solana-program-runtime" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bincode", - "eager", - "enum-iterator", - "itertools", - "libc", - "log", - "num-derive 0.3.3", - "num-traits", - "percentage", - "rand 0.7.3", - "rustc_version 0.4.0", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana_rbpf", - "thiserror", -] - -[[package]] -name = "solana-program-test" -version = "1.16.27" -dependencies = [ - "assert_matches", - "async-trait", - "base64 0.21.2", - "bincode", - "chrono-humanize", - "crossbeam-channel", - "log", - "serde", - "solana-banks-client", - "solana-banks-interface", - "solana-banks-server", - "solana-bpf-loader-program", - "solana-logger", - "solana-program-runtime", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-vote-program", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-pubsub-client" -version = "1.16.27" -dependencies = [ - "anyhow", - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "semver 1.0.17", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url 2.3.1", -] - -[[package]] -name = "solana-quic-client" -version = "1.16.27" -dependencies = [ - "async-mutex", - "async-trait", - "crossbeam-channel", - "futures 0.3.28", - "itertools", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "quinn-udp", - "rcgen", - "rustls 0.20.8", - "solana-connection-cache", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-rayon-threadlimit" -version = "1.16.27" -dependencies = [ - "lazy_static", - "num_cpus", -] - -[[package]] -name = "solana-remote-wallet" -version = "1.16.27" -dependencies = [ - "console", - "dialoguer", - "hidapi", - "log", - "num-derive 0.3.3", - "num-traits", - "parking_lot 0.12.1", - "qstring", - "semver 1.0.17", - "solana-sdk", - "thiserror", - "uriparse", -] - -[[package]] -name = "solana-rpc" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bincode", - "bs58", - "crossbeam-channel", - "dashmap 4.0.2", - "itertools", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-http-server", - "jsonrpc-pubsub", - "libc", - "log", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "serial_test", - "soketto", - "solana-account-decoder", - "solana-address-lookup-table-program", - "solana-client", - "solana-entry", - "solana-faucet", - "solana-gossip", - "solana-ledger", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-rayon-threadlimit", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-stake-program", - "solana-storage-bigtable", - "solana-streamer", - "solana-tpu-client", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-pod", - "spl-token", - "spl-token-2022", - "stream-cancel", - "symlink", - "thiserror", - "tokio", - "tokio-util 0.6.9", -] - -[[package]] -name = "solana-rpc-client" -version = "1.16.27" -dependencies = [ - "assert_matches", - "async-trait", - "base64 0.21.2", - "bincode", - "bs58", - "crossbeam-channel", - "futures 0.3.28", - "indicatif", - "jsonrpc-core", - "jsonrpc-http-server", - "log", - "reqwest", - "semver 1.0.17", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", -] - -[[package]] -name = "solana-rpc-client-api" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bs58", - "jsonrpc-core", - "reqwest", - "semver 1.0.17", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-rpc-client-nonce-utils" -version = "1.16.27" -dependencies = [ - "anyhow", - "clap 2.33.3", - "futures 0.3.28", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-rpc-test" -version = "1.16.27" -dependencies = [ - "bincode", - "bs58", - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "serde", - "serde_json", - "solana-account-decoder", - "solana-client", - "solana-logger", - "solana-pubsub-client", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-transaction-status", - "tokio", -] - -[[package]] -name = "solana-runtime" -version = "1.16.27" -dependencies = [ - "arrayref", - "assert_matches", - "base64 0.21.2", - "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap 4.0.2", - "dir-diff", - "ed25519-dalek", - "flate2", - "fnv", - "im", - "index_list", - "itertools", - "lazy_static", - "libsecp256k1", - "log", - "lru", - "lz4", - "memmap2", - "memoffset 0.9.0", - "modular-bitfield", - "num-derive 0.3.3", - "num-traits", - "num_cpus", - "num_enum 0.6.1", - "once_cell", - "ouroboros", - "percentage", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "regex", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "serde_json", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-bucket-map", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-loader-v4-program", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-version", - "solana-vote-program", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "static_assertions", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "test-case", - "thiserror", - "zstd", -] - -[[package]] -name = "solana-sdk" -version = "1.16.27" -dependencies = [ - "anyhow", - "assert_matches", - "base64 0.21.2", - "bincode", - "bitflags", - "borsh 0.10.3", - "bs58", - "bytemuck", - "byteorder", - "chrono", - "curve25519-dalek", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array 0.14.7", - "hex", - "hmac 0.12.1", - "itertools", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rustc_version 0.4.0", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "serde_json", - "serde_with", - "sha2 0.10.6", - "sha3 0.10.4", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-program", - "solana-sdk-macro", - "static_assertions", - "thiserror", - "tiny-bip39", - "uriparse", - "wasm-bindgen", -] - -[[package]] -name = "solana-sdk-macro" -version = "1.16.27" -dependencies = [ - "bs58", - "proc-macro2 1.0.76", - "quote 1.0.28", - "rustversion", - "syn 2.0.43", -] - -[[package]] -name = "solana-send-transaction-service" -version = "1.16.27" -dependencies = [ - "crossbeam-channel", - "log", - "solana-client", - "solana-logger", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-tpu-client", -] - -[[package]] -name = "solana-stake-accounts" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "solana-clap-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-stake-program", - "solana-version", -] - -[[package]] -name = "solana-stake-program" -version = "1.16.27" -dependencies = [ - "assert_matches", - "bincode", - "log", - "proptest", - "rustc_version 0.4.0", - "solana-config-program", - "solana-logger", - "solana-program-runtime", - "solana-sdk", - "solana-vote-program", - "test-case", -] - -[[package]] -name = "solana-storage-bigtable" -version = "1.16.27" -dependencies = [ - "backoff", - "bincode", - "bytes", - "bzip2", - "enum-iterator", - "flate2", - "futures 0.3.28", - "goauth", - "http", - "hyper", - "hyper-proxy", - "log", - "openssl", - "prost 0.11.9", - "prost-types 0.11.9", - "serde", - "serde_derive", - "smpl_jwt", - "solana-metrics", - "solana-sdk", - "solana-storage-proto", - "solana-transaction-status", - "thiserror", - "tokio", - "tonic 0.8.3", - "zstd", -] - -[[package]] -name = "solana-storage-proto" -version = "1.16.27" -dependencies = [ - "bincode", - "bs58", - "enum-iterator", - "prost 0.11.9", - "protobuf-src", - "serde", - "solana-account-decoder", - "solana-sdk", - "solana-transaction-status", - "tonic-build 0.8.4", -] - -[[package]] -name = "solana-store-tool" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "log", - "solana-logger", - "solana-runtime", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-streamer" -version = "1.16.27" -dependencies = [ - "async-channel", - "bytes", - "crossbeam-channel", - "futures-util", - "histogram", - "indexmap", - "itertools", - "libc", - "log", - "nix", - "pem", - "percentage", - "pkcs8", - "quinn", - "quinn-proto", - "quinn-udp", - "rand 0.7.3", - "rcgen", - "rustls 0.20.8", - "solana-logger", - "solana-metrics", - "solana-perf", - "solana-sdk", - "thiserror", - "tokio", - "x509-parser", -] - -[[package]] -name = "solana-system-program" -version = "1.16.27" -dependencies = [ - "assert_matches", - "bincode", - "log", - "serde", - "serde_derive", - "solana-logger", - "solana-program-runtime", - "solana-sdk", -] - -[[package]] -name = "solana-test-validator" -version = "1.16.27" -dependencies = [ - "base64 0.21.2", - "bincode", - "crossbeam-channel", - "log", - "serde_derive", - "serde_json", - "solana-cli-output", - "solana-client", - "solana-core", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-net-utils", - "solana-program-runtime", - "solana-program-test", - "solana-rpc", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-tpu-client", - "tokio", -] - -[[package]] -name = "solana-thin-client" -version = "1.16.27" -dependencies = [ - "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-logger", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", -] - -[[package]] -name = "solana-tokens" -version = "1.16.27" -dependencies = [ - "bincode", - "chrono", - "clap 2.33.3", - "console", - "csv", - "ctrlc", - "indexmap", - "indicatif", - "pickledb", - "serde", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-logger", - "solana-remote-wallet", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "solana-test-validator", - "solana-transaction-status", - "solana-version", - "spl-associated-token-account", - "spl-token", - "tempfile", - "thiserror", -] - -[[package]] -name = "solana-tpu-client" -version = "1.16.27" -dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap", - "indicatif", - "log", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-transaction-dos" -version = "1.16.27" -dependencies = [ - "bincode", - "clap 2.33.3", - "log", - "rand 0.7.3", - "rayon", - "solana-clap-utils", - "solana-cli", - "solana-client", - "solana-core", - "solana-faucet", - "solana-gossip", - "solana-local-cluster", - "solana-logger", - "solana-measure", - "solana-net-utils", - "solana-rpc-client", - "solana-runtime", - "solana-sdk", - "solana-streamer", - "solana-transaction-status", - "solana-version", -] - -[[package]] -name = "solana-transaction-status" -version = "1.16.27" -dependencies = [ - "Inflector", - "base64 0.21.2", - "bincode", - "borsh 0.10.3", - "bs58", - "lazy_static", - "log", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-address-lookup-table-program", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "solana-udp-client" -version = "1.16.27" -dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", -] - -[[package]] -name = "solana-upload-perf" -version = "1.16.27" -dependencies = [ - "serde_json", - "solana-metrics", -] - -[[package]] -name = "solana-validator" -version = "1.16.27" -dependencies = [ - "chrono", - "clap 2.33.3", - "console", - "core_affinity", - "crossbeam-channel", - "fd-lock", - "indicatif", - "itertools", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-ipc-server", - "jsonrpc-server-utils", - "lazy_static", - "libc", - "libloading", - "log", - "num_cpus", - "rand 0.7.3", - "rayon", - "serde", - "serde_json", - "serde_yaml 0.9.21", - "signal-hook", - "solana-account-decoder", - "solana-clap-utils", - "solana-cli-config", - "solana-core", - "solana-download-utils", - "solana-entry", - "solana-faucet", - "solana-genesis-utils", - "solana-geyser-plugin-interface", - "solana-geyser-plugin-manager", - "solana-gossip", - "solana-ledger", - "solana-logger", - "solana-metrics", - "solana-net-utils", - "solana-perf", - "solana-poh", - "solana-rpc", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-storage-bigtable", - "solana-streamer", - "solana-test-validator", - "solana-tpu-client", - "solana-version", - "solana-vote-program", - "spl-token-2022", - "symlink", - "thiserror", - "tikv-jemallocator", -] - -[[package]] -name = "solana-version" -version = "1.16.27" -dependencies = [ - "log", - "rustc_version 0.4.0", - "semver 1.0.17", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", -] - -[[package]] -name = "solana-vote-program" -version = "1.16.27" -dependencies = [ - "bincode", - "log", - "num-derive 0.3.3", - "num-traits", - "rustc_version 0.4.0", - "serde", - "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "test-case", - "thiserror", -] - -[[package]] -name = "solana-watchtower" -version = "1.16.27" -dependencies = [ - "clap 2.33.3", - "humantime", - "log", - "solana-clap-utils", - "solana-cli-config", - "solana-cli-output", - "solana-logger", - "solana-metrics", - "solana-notifier", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "solana-version", -] - -[[package]] -name = "solana-zk-keygen" -version = "1.16.27" -dependencies = [ - "bs58", - "clap 3.2.23", - "dirs-next", - "num_cpus", - "solana-clap-v3-utils", - "solana-cli-config", - "solana-remote-wallet", - "solana-sdk", - "solana-version", - "solana-zk-token-sdk", - "tempfile", - "thiserror", - "tiny-bip39", -] - -[[package]] -name = "solana-zk-token-proof-program" -version = "1.16.27" -dependencies = [ - "bytemuck", - "getrandom 0.1.16", - "num-derive 0.3.3", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-proof-program-tests" -version = "1.16.27" -dependencies = [ - "bytemuck", - "curve25519-dalek", - "solana-program-runtime", - "solana-program-test", - "solana-sdk", - "solana-zk-token-sdk", -] - -[[package]] -name = "solana-zk-token-sdk" -version = "1.16.27" -dependencies = [ - "aes-gcm-siv", - "base64 0.21.2", - "bincode", - "bytemuck", - "byteorder", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", - "lazy_static", - "merlin", - "num-derive 0.3.3", - "num-traits", - "rand 0.7.3", - "serde", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "tiny-bip39", - "zeroize", -] - -[[package]] -name = "solana_rbpf" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" -dependencies = [ - "byteorder", - "combine", - "gdbstub", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi 0.3.9", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" - -[[package]] -name = "spki" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "spl-associated-token-account" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" -dependencies = [ - "assert_matches", - "borsh 0.10.3", - "num-derive 0.4.0", - "num-traits", - "solana-program", - "spl-token", - "spl-token-2022", - "thiserror", -] - -[[package]] -name = "spl-discriminator" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", -] - -[[package]] -name = "spl-discriminator-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadbefec4f3c678215ca72bd71862697bb06b41fd77c0088902dd3203354387b" -dependencies = [ - "quote 1.0.28", - "spl-discriminator-syn", - "syn 2.0.43", -] - -[[package]] -name = "spl-discriminator-syn" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5f2044ca42c8938d54d1255ce599c79a1ffd86b677dfab695caa20f9ffc3f2" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "sha2 0.10.6", - "syn 2.0.43", - "thiserror", -] - -[[package]] -name = "spl-instruction-padding" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c5557ec281a34f7f9053feb6e0d795162ba0c6a52898b21c3d1e899481191d5" -dependencies = [ - "num_enum 0.5.11", - "solana-program", -] - -[[package]] -name = "spl-memo" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" -dependencies = [ - "solana-program", -] - -[[package]] -name = "spl-pod" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" -dependencies = [ - "borsh 0.10.3", - "bytemuck", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", -] - -[[package]] -name = "spl-program-error" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" -dependencies = [ - "num-derive 0.4.0", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror", -] - -[[package]] -name = "spl-program-error-derive" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5269c8e868da17b6552ef35a51355a017bd8e0eae269c201fef830d35fa52c" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "sha2 0.10.6", - "syn 2.0.43", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-token" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.3.3", - "num-traits", - "num_enum 0.6.1", - "solana-program", - "thiserror", -] - -[[package]] -name = "spl-token-2022" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.0", - "num-traits", - "num_enum 0.7.0", - "solana-program", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" -dependencies = [ - "borsh 0.10.3", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", -] - -[[package]] -name = "spl-transfer-hook-interface" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", -] - -[[package]] -name = "spl-type-length-value" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stream-cancel" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" -dependencies = [ - "futures-core", - "pin-project", - "tokio", -] - -[[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.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.0", - "proc-macro2 1.0.76", - "quote 1.0.28", - "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 = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - -[[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.76", - "quote 1.0.28", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", - "unicode-xid 0.2.2", -] - -[[package]] -name = "sys-info" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "sysctl" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e483f02d0ad107168dc57381a8a40c3aeea6abe47f37506931f861643cfa8" -dependencies = [ - "bitflags", - "byteorder", - "libc", - "thiserror", - "walkdir", -] - -[[package]] -name = "systemstat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24aec24a9312c83999a28e3ef9db7e2afd5c64bf47725b758cdc1cafd5b0bd2" -dependencies = [ - "bytesize", - "lazy_static", - "libc", - "nom", - "time 0.3.9", - "winapi 0.3.9", -] - -[[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 = "tarpc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" -dependencies = [ - "anyhow", - "fnv", - "futures 0.3.28", - "humantime", - "opentelemetry", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util 0.6.9", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termtree" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" - -[[package]] -name = "test-case" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" -dependencies = [ - "test-case-macros", -] - -[[package]] -name = "test-case-macros" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro-error", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[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 = "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.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "thread-scoped" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbb6aa301e5d3b0b5ef639c9a9c7e2f1c944f177b460c04dc24c69b1fa2bd99" - -[[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 = "tikv-jemalloc-sys" -version = "0.4.2+5.2.1-patched.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5844e429d797c62945a566f8da4e24c7fe3fbd5d6617fd8bf7a0b7dc1ee0f22e" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" -dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - -[[package]] -name = "tinyvec" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" -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.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "parking_lot 0.11.2", - "pin-project-lite", - "signal-hook-registry", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki 0.22.0", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", - "serde_json", -] - -[[package]] -name = "tokio-stream" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" -dependencies = [ - "futures-util", - "log", - "rustls 0.20.8", - "tokio", - "tokio-rustls 0.23.3", - "tungstenite", - "webpki 0.22.0", - "webpki-roots", -] - -[[package]] -name = "tokio-util" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite", - "slab", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "tonic" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding 2.2.0", - "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", - "tokio", - "tokio-rustls 0.22.0", - "tokio-stream", - "tokio-util 0.6.9", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding 2.2.0", - "pin-project", - "prost 0.11.9", - "prost-derive 0.11.9", - "rustls-pemfile 1.0.0", - "tokio", - "tokio-rustls 0.23.3", - "tokio-stream", - "tokio-util 0.7.1", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2 1.0.76", - "prost-build 0.9.0", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease 0.1.9", - "proc-macro2 1.0.76", - "prost-build 0.11.4", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util 0.7.1", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" - -[[package]] -name = "tracing" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", -] - -[[package]] -name = "tracing-core" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-opentelemetry" -version = "0.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9378e96a9361190ae297e7f3a8ff644aacd2897f244b1ff81f381669196fa6" -dependencies = [ - "opentelemetry", - "tracing", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" -dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", -] - -[[package]] -name = "trees" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de5f738ceab88e2491a94ddc33c3feeadfa95fedc60363ef110845df12f3878" - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "tungstenite" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls 0.20.8", - "sha-1 0.10.0", - "thiserror", - "url 2.3.1", - "utf-8", - "webpki 0.22.0", - "webpki-roots", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" - -[[package]] -name = "unicode-ident" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - -[[package]] -name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "uriparse" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200d0fc04d809396c2ad43f3c95da3582a2556eba8d453c1087f4120ee352ff" -dependencies = [ - "fnv", - "lazy_static", -] - -[[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 = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b" - -[[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 = "void" -version = "1.0.2" -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.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "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.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.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" -dependencies = [ - "quote 1.0.28", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 2.0.43", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" - -[[package]] -name = "web-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" -dependencies = [ - "webpki 0.22.0", -] - -[[package]] -name = "which" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" -dependencies = [ - "either", - "lazy_static", - "libc", -] - -[[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-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.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -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-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.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.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.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.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.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.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time 0.3.9", -] - -[[package]] -name = "xattr" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] - -[[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 = "yasna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" -dependencies = [ - "time 0.3.9", -] - -[[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 1.0.76", - "quote 1.0.28", - "syn 2.0.43", -] - -[[package]] -name = "zeroize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" -dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.28", - "syn 1.0.109", - "synstructure", -] - -[[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", -] - -[[package]] -name = "zstd-safe" -version = "5.0.1+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12659121420dd6365c5c3de4901f97145b79651fb1d25814020ed2ed0585ae" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" -dependencies = [ - "cc", - "libc", -] diff --git a/pkgs/applications/blockchains/solana/account-info.patch b/pkgs/applications/blockchains/solana/account-info.patch deleted file mode 100644 index 2893bfead3451..0000000000000 --- a/pkgs/applications/blockchains/solana/account-info.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdk/program/src/account_info.rs b/sdk/program/src/account_info.rs -index 372370d0e15a0f2877b02ad29586e5b352438b24..3db3e9839b6535786e60be5602c03d0c909bf937 100644 ---- a/sdk/program/src/account_info.rs -+++ b/sdk/program/src/account_info.rs -@@ -182,6 +182,7 @@ impl<'a> AccountInfo<'a> { - Ok(()) - } - -+ #[rustversion::attr(since(1.72), allow(invalid_reference_casting))] - pub fn assign(&self, new_owner: &Pubkey) { - // Set the non-mut owner field - unsafe { diff --git a/pkgs/applications/blockchains/solana/default.nix b/pkgs/applications/blockchains/solana/default.nix deleted file mode 100644 index b19abd63a8c66..0000000000000 --- a/pkgs/applications/blockchains/solana/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv -, fetchFromGitHub -, lib -, rustPlatform -, darwin -, udev -, protobuf -, libcxx -, rocksdb -, pkg-config -, openssl -, nix-update-script -# Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84 -, solanaPkgs ? [ - "solana" - "solana-bench-tps" - "solana-faucet" - "solana-gossip" - "solana-install" - "solana-keygen" - "solana-ledger-tool" - "solana-log-analyzer" - "solana-net-shaper" - "solana-validator" -] ++ [ - # XXX: Ensure `solana-genesis` is built LAST! - # See https://github.com/solana-labs/solana/issues/5826 - "solana-genesis" - ] -}: -let - version = "1.16.27"; - sha256 = "sha256-xd0FCSlpPJDVWOlt9rIlnSbjksmvlXJWHkvlZONd2dM="; - - inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security; -in -rustPlatform.buildRustPackage rec { - pname = "solana-cli"; - inherit version; - - src = fetchFromGitHub { - owner = "solana-labs"; - repo = "solana"; - rev = "v${version}"; - inherit sha256; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - - outputHashes = { - "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws="; - "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; - }; - }; - - patches = [ - # Fix: https://github.com/solana-labs/solana/issues/34203 - # From https://github.com/Homebrew/homebrew-core/pull/156930/files#diff-f27c55b86df31cd4935c956efee1be743eae0958e3850f3f9891d51bfea50b1cR76 - ./account-info.patch - ]; - - strictDeps = true; - cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; - - # Even tho the tests work, a shit ton of them try to connect to a local RPC - # or access internet in other ways, eventually failing due to Nix sandbox. - # Maybe we could restrict the check to the tests that don't require an RPC, - # but judging by the quantity of tests, that seems like a lengthty work and - # I'm not in the mood ((ΦωΦ)) - doCheck = false; - - nativeBuildInputs = [ protobuf pkg-config ]; - buildInputs = [ openssl rustPlatform.bindgenHook ] - ++ lib.optionals stdenv.isLinux [ udev ] - ++ lib.optionals stdenv.isDarwin [ - libcxx - IOKit - Security - AppKit - System - Libsystem ]; - - postInstall = '' - mkdir -p $out/bin/sdk/bpf - cp -a ./sdk/bpf/* $out/bin/sdk/bpf/ - ''; - - # Used by build.rs in the rocksdb-sys crate. If we don't set these, it would - # try to build RocksDB from source. - ROCKSDB_LIB_DIR="${rocksdb}/lib"; - - # Require this on darwin otherwise the compiler starts rambling about missing - # cmath functions - CPPFLAGS=lib.optionals stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; - LDFLAGS=lib.optionals stdenv.isDarwin "-L${lib.getLib libcxx}/lib"; - - # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. - OPENSSL_NO_VENDOR = 1; - - meta = with lib; { - description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; - homepage = "https://solana.com"; - license = licenses.asl20; - maintainers = with maintainers; [ netfox happysalada aikooo7 ]; - platforms = platforms.unix; - }; - - passthru.updateScript = nix-update-script { }; -} diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 32b8066ff42ec..8552d12bc9bf4 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -21,45 +21,47 @@ let pname = "sparrow"; - version = "1.8.1"; + version = "1.8.4"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "sha256-dpYGMclYMjxjUbIcSZ7V54I1LTVfHxAKH9+7CaprD4U="; + sha256 = "0w6z84w9spwfpqrf5m9bcq30xqp94c27jw3qzxfdyisp8n22xvd8"; }; launcher = writeScript "sparrow" '' #! ${bash}/bin/bash params=( --module-path @out@/lib:@jdkModules@/modules - --add-opens javafx.graphics/com.sun.javafx.css=org.controlsfx.controls - --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls - --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls - --add-opens javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls - --add-opens javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls - --add-opens javafx.base/com.sun.javafx.event=org.controlsfx.controls - --add-opens javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow - --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow - --add-opens org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml - --add-opens javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx - --add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx - --add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow + --add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls + --add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls + --add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls + --add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls + --add-opens=javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls + --add-opens=javafx.base/com.sun.javafx.event=org.controlsfx.controls + --add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow + --add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow + --add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml + --add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx + --add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx + --add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx + --add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx + --add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx + --add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow --add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow - --add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow - --add-opens java.base/java.net=com.sparrowwallet.sparrow - --add-opens java.base/java.io=com.google.gson + --add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow + --add-opens=java.base/java.net=com.sparrowwallet.sparrow + --add-opens=java.base/java.io=com.google.gson --add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow - --add-reads com.sparrowwallet.merged.module=java.desktop - --add-reads com.sparrowwallet.merged.module=java.sql - --add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow - --add-reads com.sparrowwallet.merged.module=logback.classic - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.databind - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation - --add-reads com.sparrowwallet.merged.module=com.fasterxml.jackson.core - --add-reads com.sparrowwallet.merged.module=co.nstant.in.cbor + --add-reads=com.sparrowwallet.merged.module=java.desktop + --add-reads=com.sparrowwallet.merged.module=java.sql + --add-reads=com.sparrowwallet.merged.module=com.sparrowwallet.sparrow + --add-reads=com.sparrowwallet.merged.module=ch.qos.logback.classic + --add-reads=com.sparrowwallet.merged.module=org.slf4j + --add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind + --add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation + --add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core + --add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor + --add-reads=kotlin.stdlib=kotlinx.coroutines.core -m com.sparrowwallet.sparrow ) diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index cf684e062c5cb..5c4a7cc8b3549 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, gcc-unwrapped , dpkg , util-linux , bash @@ -57,8 +56,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" + --add-flags $out/share/${pname}/resources/app.aasar ''; meta = with lib; { diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 13b29dbc200f3..328e423535f34 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.2.4"; + version = "24.3.2"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA=="; - x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA=="; + aarch64-linux = "sha512-oj/UrUFTH0QZD2eTHdR/Lu6Tz6AIhbIBgPJD3jH1YJKgOZIzX21H0KSddMgu+iKPw2WmoKf0UP+qqf+yFs/mVQ=="; + x86_64-linux = "sha512-RakNuSDKR0neO0IZwTVaARX9tWNDfJwOBFL3teUsNlcrur862I1c6NaaA/RxriujolDRI+wgG0twaUGEXXar5g=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 254589c7a43ec..ff0511a15c1c3 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , glib , gtk4 , pango @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "gtk4_8" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook]; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ glib gtk4 pango librsvg ]; meta = with lib; { diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index 803b61caa8bee..1026f3a61e779 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -1,6 +1,10 @@ { lib , rustPlatform , fetchFromSourcehut +, autoPatchelfHook +, gcc-unwrapped +, wayland +, libxkbcommon }: rustPlatform.buildRustPackage rec { @@ -16,6 +20,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y="; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ gcc-unwrapped ]; + + runtimeDependencies = map lib.getLib [ + gcc-unwrapped + wayland + libxkbcommon + ]; + meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 6e817646d9e75..dcc59560a246d 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch, zlib, ncurses }: +{ lib, gccStdenv, fetchurl, fetchpatch, zlib, ncurses }: +let stdenv = gccStdenv; +in stdenv.mkDerivation rec { pname = "aewan"; version = "1.0.01"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 2cd1dff33c729..72814c5edda6f 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -21,11 +21,21 @@ , gzip , fontconfig , freetype +, libbsd , libpulseaudio , libGL +, libdrm +, libpng , libuuid , libX11 , libxcb +, libxkbcommon +, xcbutilwm +, xcbutilrenderutil +, xcbutilkeysyms +, xcbutilimage +, xcbutilcursor +, libxkbfile , libXcomposite , libXcursor , libXdamage @@ -51,6 +61,7 @@ , which , runCommand , xkeyboard_config +, xorg , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper @@ -136,15 +147,27 @@ let alsa-lib dbus expat + libbsd libpulseaudio libuuid libX11 libxcb + libxkbcommon + xcbutilwm + xcbutilrenderutil + xcbutilkeysyms + xcbutilimage + xcbutilcursor + xorg.libICE + xorg.libSM + libxkbfile libXcomposite libXcursor libXdamage libXfixes libGL + libdrm + libpng nspr nss_latest systemd diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 785feeb989904..d3940efaccc11 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" - sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; + version = "2023.2.1.25"; # "Android Studio Iguana | 2023.2.1 Patch 2" + sha256Hash = "sha256-zWPq1GfckqCP9rNpXAHVfoApdvxkrN3NMc1qJCf/obw="; }; betaVersion = { - version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" - sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; + version = "2023.3.1.17"; # "Android Studio Jellyfish | 2023.3.1.1 RC 2" + sha256Hash = "sha256-zROBKzQiP4V2P67HgOIkHgn8q/M0zy5MkZozVSiQsWU="; }; latestVersion = { - version = "2023.3.1.12"; # "Android Studio Jellyfish | 2023.3.1 Canary 12" - sha256Hash = "sha256-yg84WBLHfb6q+OlHuh5SJ5P4Fuc8yqO9eZ8iecOhZj4="; + version = "2024.1.1.4"; # "Android Studio Koala | 2024.1.1 Canary 6" + sha256Hash = "sha256-lfig7lFyF7XZowTQKpo6zGeR23VHq/f7vvUDWCs7jeo="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 92d8771383dc6..e41edcdd66b89 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -14,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = "1.3.2"; + version = "1.3.6"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-8PXqMDf2ATxmtFqyZlGip+DhGrdK8M6Ztte7fGH6Fmo="; + hash = "sha256-17f6pIGsOIswnyY63pjHKEEYuCo43kf25mPLBv4vQAs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 0ec47ceb95666..afcc62a289994 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "bluefish"; - version = "2.2.14"; + version = "2.2.15"; src = fetchurl { url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; - sha256 = "sha256-IszfnOTlyWIQY+bPfXOr+wc2q3pyvOCG0Gxc9e4SXt4="; + sha256 = "sha256-YUPlHGtVedWW86moXg8NhYDJ9Y+ChXWxGYgODKHZQbw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index f74d554a8c73c..6e663e1e317b2 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.22.2"; + version = "15.23.1"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-aYGZPoA2Tux6pmpZFShkZB+os34jZczXsfmYN/pu+Ic="; + sha256 = "sha256-9ZzWsLEPEG+PDrDf9lU4ODGOD6/fvMbGBSo9BEQrkn4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index 773ef1af035e2..9f8c14a37e039 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -5,6 +5,7 @@ , qtbase , qttools , wrapQtAppsHook +, syntax-highlighting , cmake , ninja , python3 @@ -13,25 +14,23 @@ stdenv.mkDerivation rec { pname = "cpeditor"; - version = "6.11.2"; + version = "7.0.1"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; rev = version; - sha256 = "sha256-zotbXzRjIwZdYluJiz6GWUIOXl/wz1TWt+dcTwMhURo="; + hash = "sha256-t7nn3sO45dOQq5OMWhaseO9XHicQ/1fjukXal5yPMgY"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook python3 ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ qtbase qttools syntax-highlighting ]; postPatch = '' - substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}" + substituteInPlace src/Core/Runner.cpp --replace-fail "/bin/bash" "${runtimeShell}" ''; - env.NIX_CFLAGS_COMPILE = "-std=c++14"; - meta = with lib; { description = "An IDE specially designed for competitive programming"; homepage = "https://cpeditor.org"; 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 09413f741158f..797ecd493d219 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -41,10 +41,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.6pre0.20240218.181422"; + version = "0.8pre0.20240313.183743"; src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.6pre0.20240218.181422.tar"; - sha256 = "172rbxnhbdppkr4kc2a11i9588dfcz629d2flg2sfmx5j23995zn"; + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240313.183743.tar"; + sha256 = "1ba85ik0knxrlhw2prwsawin5r86n75qm240qkgkd05xhm7znqnw"; }; packageRequires = [ emacs persist ]; meta = { @@ -220,10 +220,10 @@ elpaBuild { pname = "aircon-theme"; ename = "aircon-theme"; - version = "0.0.6.0.20220827.93355"; + version = "0.0.6.0.20240307.233340"; src = fetchurl { - url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20220827.93355.tar"; - sha256 = "0p2svw1db5km3ks2ywb38lsqh0y54ng8wgmh1s80mzvcflc8gia6"; + url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar"; + sha256 = "1jw2w80sjglh1fq4psr5nflm20h37ldd5xjlqbmfd46ghmlanb1d"; }; packageRequires = [ emacs ]; meta = { @@ -311,14 +311,29 @@ 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 = "0k9n0j5q5l2bwbb7yql8jg9fnqvmk7mgx6dv612hpv9hdsls65h1"; + }; + 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.20240108.152601"; + version = "1.9.8.0.20240323.191212"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240108.152601.tar"; - sha256 = "01sh3szrpjc2hpmrdrkiv34whw37c9xdybvipjn9xzi5b66m613a"; + url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar"; + sha256 = "0w0nqdam98ahvbbbzr3i4z7zx2xfl6h1b3aq53qn8cxwnl1mfnqx"; }; packageRequires = [ emacs ]; meta = { @@ -333,10 +348,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.3.0.20240220.160410"; + version = "14.0.4.0.20240317.113904"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.3.0.20240220.160410.tar"; - sha256 = "1j4i9m9018s606wbrx4r439i479jqf9f5040m9b3qbqhgqwklw8z"; + url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240317.113904.tar"; + sha256 = "1iwzym6ygq0wzb96qgbv7530fv3cxykjilbxzxb3la3xhqb93qhs"; }; packageRequires = [ emacs ]; meta = { @@ -478,10 +493,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.0.1.0.20240210.51926"; + version = "1.0.1.0.20240224.51508"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240210.51926.tar"; - sha256 = "13j35grsh452wwv69qkxckwa8ip27x10bnk5vs60higair15624k"; + url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240224.51508.tar"; + sha256 = "1i22lbwck2q80byxd6bd6cba9jj3iqzsj129rb81a221wp91sarj"; }; packageRequires = [ emacs ]; meta = { @@ -513,10 +528,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20240210.91008"; + version = "2.4.1.0.20240321.194020"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240210.91008.tar"; - sha256 = "034r93cf4dkrzggfacmwg6ny05wxdzva6ia6ry7x2saf7fhlb6qh"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; + sha256 = "0fjx32brckrmbvcyps45akzhimw93rzi7hy7f8nx0j72nkncavpp"; }; packageRequires = [ emacs ]; meta = { @@ -631,18 +646,14 @@ license = lib.licenses.free; }; }) {}; - brief = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice }: + brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "brief"; ename = "brief"; - version = "5.88.22.2.0.20230818.125719"; + version = "5.90.0.20240321.65101"; src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.88.22.2.0.20230818.125719.tar"; - sha256 = "1h9kqphbzmg0jwms8zd0ch0sgg8z1g847wcggr3842xhdayxds1k"; + url = "https://elpa.gnu.org/devel/brief-5.90.0.20240321.65101.tar"; + sha256 = "1z4nww74gaxjjjfg4i9qdk6lwfjnbsc41jq95k0pcj12ilwilg54"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -658,10 +669,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.5.0.20231028.161716"; + version = "0.6.0.20240323.72724"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231028.161716.tar"; - sha256 = "1gi7092mfzsqfj8l000arxdwmg73xzbgzfliazzk0s617480ccbw"; + url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; + sha256 = "1bdch2ah5c0ikzl2zyfv7hkpbhvkvcdd4ljkzd5zmnwj11fk7ml2"; }; packageRequires = [ compat emacs ]; meta = { @@ -759,10 +770,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.3.0.20240214.113952"; + version = "1.4.0.20240315.54216"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.3.0.20240214.113952.tar"; - sha256 = "01q9hrzar17zrcm1ayakg6xamz5a434294d3xij9yalwrnnpvrd3"; + url = "https://elpa.gnu.org/devel/cape-1.4.0.20240315.54216.tar"; + sha256 = "0pqr36i8ijq32kf0qxb0hdm0gffakya12jjj4dy0hwan13scq77d"; }; packageRequires = [ compat emacs ]; meta = { @@ -926,10 +937,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.3.0.20231008.111300"; + version = "0.4.0.20240302.74422"; src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.3.0.20231008.111300.tar"; - sha256 = "184811v36aa080fx2xkpx1p7fmd1s739apxryywpmisjq9alkkl9"; + url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240302.74422.tar"; + sha256 = "0zgna6h5v2mgmlkxyxla0faf3xrs13mv62xayyf3ddrhjgk82ggb"; }; packageRequires = [ emacs ]; meta = { @@ -961,10 +972,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20240218.181202"; + version = "0.10.2.0.20240311.194338"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240218.181202.tar"; - sha256 = "0w170l9br7cxq8ili7jba89qx45wfkhqbz0yrvmmwa27qh2nz4ki"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240311.194338.tar"; + sha256 = "159g5aii6bw006hkb49f653zc3lnnxnimg2xmyvwl0rgyk7imfl1"; }; packageRequires = [ emacs ]; meta = { @@ -1037,10 +1048,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.4.0.20240213.64417"; + version = "29.1.4.5.0.20240316.105418"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20240213.64417.tar"; - sha256 = "1ihkqsa6akwk3p4z83iwbizcp0bg0gla5klavzrfppnnpyh83nrf"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240316.105418.tar"; + sha256 = "1f0rhf0p2szvqq1ixv7fxn726h3mnc0iqlyal1qzrf46vdsjkf87"; }; packageRequires = [ emacs seq ]; meta = { @@ -1052,10 +1063,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.3.0.20240223.131438"; + version = "1.4.0.20240324.100717"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.3.0.20240223.131438.tar"; - sha256 = "0pibhg8i7rcxbkzlkz37v5w9x566ffabx7jmhjzgjgq7v6cgqzv6"; + url = "https://elpa.gnu.org/devel/consult-1.4.0.20240324.100717.tar"; + sha256 = "1dngyxxviml9a4gqr85ah38pb4028wx2cvm8g9h4jp02g4cr7rkc"; }; packageRequires = [ compat emacs ]; meta = { @@ -1063,8 +1074,7 @@ license = lib.licenses.free; }; }) {}; - consult-hoogle = callPackage ({ consult - , elpaBuild + consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl , haskell-mode @@ -1072,12 +1082,12 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.1.1.0.20240211.83945"; + version = "0.2.0.0.20240309.142502"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.1.1.0.20240211.83945.tar"; - sha256 = "1ka6k26k3zr86p4z7lxb7jsh9wrhkiz8mp552jbz3v6kyifcmaq1"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.0.0.20240309.142502.tar"; + sha256 = "0igkhv7hg4bd6h27j16w2in6d542818ich94fhif4g36xh0jhdw7"; }; - packageRequires = [ consult emacs haskell-mode ]; + packageRequires = [ emacs haskell-mode ]; meta = { homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; license = lib.licenses.free; @@ -1124,10 +1134,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.2.0.20240212.223716"; + version = "1.2.0.20240320.91948"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240212.223716.tar"; - sha256 = "179sprpnfwda9ibgcn3q2g6czbxl40p0l1sfa0pbs5kzwjslg0i9"; + url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240320.91948.tar"; + sha256 = "1gpqqh7f0ywn3mg31psdl7nanl3zqf3bddxz0hs018yp9dhr4d9v"; }; packageRequires = [ compat emacs ]; meta = { @@ -1159,10 +1169,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.2.0.20240214.214516"; + version = "0.14.2.0.20240229.151718"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240214.214516.tar"; - sha256 = "0fnx7m76zrspnrmcbj359724w6ih77pyl17w1968r621law6i37i"; + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240229.151718.tar"; + sha256 = "0wq8by3bc15cry533ybawzpb6qypnzvq79kpd9h0wrkd1yfbdazz"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1308,10 +1318,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.7.0.0.20240223.130714"; + version = "0.9.0.0.20240318.94928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.7.0.0.20240223.130714.tar"; - sha256 = "1jm7r04bi22flwh83cfv6grla76s3c6qayw4iz6mbiwpqc4yx3qa"; + url = "https://elpa.gnu.org/devel/dape-0.9.0.0.20240318.94928.tar"; + sha256 = "0f190gkicqqj02irhgcwcjjalh4srbcd9y80src888wp775vwy1x"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1371,10 +1381,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.40.0.20240215.214858"; + version = "0.40.0.20240318.175047"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240215.214858.tar"; - sha256 = "0kf6f8qpshdx07zbpgglpz01daq2ix3sw006yn1qx07bxj1kihsd"; + url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar"; + sha256 = "1vkap2h2041hib1rw3n91z9hs6vfphkgi84257x7b8yj1f0dr2xn"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1401,10 +1411,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.2.4.0.20240223.62237"; + version = "2.3.0.0.20240324.175148"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.2.4.0.20240223.62237.tar"; - sha256 = "0h4cs61mipfxb8hzs6d7mafw7y97r0k0l68mcglr0c2lxcxv6sd3"; + url = "https://elpa.gnu.org/devel/denote-2.3.0.0.20240324.175148.tar"; + sha256 = "00bd7470a01dd92nzcw9g7zpff3sy3vzxy13ig6a7gk9i5a8c7zg"; }; packageRequires = [ emacs ]; meta = { @@ -1453,10 +1463,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.5.0.20231127.190545"; + version = "0.6.0.20240323.82337"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.5.0.20231127.190545.tar"; - sha256 = "19w6fdw6j3qpmm88nymym3h012yi6mc22bdzm6pr4m39d8m4qbqx"; + url = "https://elpa.gnu.org/devel/devdocs-0.6.0.20240323.82337.tar"; + sha256 = "1pdjf4j6wcpz98i50fx11sndqycpalwxips45lgsnjglyc8sa1lr"; }; packageRequires = [ emacs ]; meta = { @@ -1507,10 +1517,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20240127.3432"; + version = "1.9.2.0.20240225.11635"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240127.3432.tar"; - sha256 = "0i7dyl8x1mv0jk8pr5w133m0rvxqqk0dm8sfszg8azg9y0ihsigf"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240225.11635.tar"; + sha256 = "0g32092z52xmmch8aya1wz9xds93agv4509nvf4zzygg9pr40x0w"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1610,10 +1620,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20240117.24241"; + version = "0.1.1.0.20240312.193205"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240117.24241.tar"; - sha256 = "1npf39wmkfknij89qphx9qmpycr59x4sm57575ys2b50ca2bk49w"; + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240312.193205.tar"; + sha256 = "02yi5rxcv8v10zsypsn19i16rakik2ii650drk337h0iqkdwx8ax"; }; packageRequires = [ emacs ]; meta = { @@ -1787,10 +1797,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.22.0.20240117.72338"; + version = "0.8.22.0.20240305.123820"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240117.72338.tar"; - sha256 = "0x7kccnwka9ajbc21mwli2x00ysh3gzadwrjf89aq7xy8ixkx56f"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar"; + sha256 = "1y680dfqvmbpq75ylgw16jx0p7hyggi12bb1f0c7z0w0y473gdj0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1855,10 +1865,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240205.0.20240220.34251"; + version = "20240309.0.20240309.40750"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240205.0.20240220.34251.tar"; - sha256 = "01m609prd554rgwjs9igxwxair1pl6g1vgm2p890mddd0741ci7k"; + url = "https://elpa.gnu.org/devel/eev-20240309.0.20240309.40750.tar"; + sha256 = "03vmfj9ialviza0j1xdrfxrm948qfqsvj95k6xsgx6kr4fh0gy8i"; }; packageRequires = [ emacs ]; meta = { @@ -1873,10 +1883,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.5.1.0.20240223.55243"; + version = "1.6.1.0.20240322.140619"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.5.1.0.20240223.55243.tar"; - sha256 = "1i9rjlfnmq2in93q4j08w5hkhjf0mhd4sam329x2bzibq5rv4m24"; + url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240322.140619.tar"; + sha256 = "0zmwx7l3dgjrqwg4nlsjkaiqx95pswpznzzrbzzlkc4aajk9l047"; }; packageRequires = [ emacs ]; meta = { @@ -1898,10 +1908,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20240204.100650"; + version = "1.17.0.20240323.73745"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240204.100650.tar"; - sha256 = "0jcqjpw15gjgi2kbr9xjdjjy5g8gjry7q04a3cnr1ih43qa0hkhb"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240323.73745.tar"; + sha256 = "0g2a6hj6k1z74ymsl568117bql1xalf0pqlckscj8dj1glcn6jq5"; }; packageRequires = [ eldoc @@ -1987,8 +1997,7 @@ license = lib.licenses.free; }; }) {}; - ellama = callPackage ({ dash - , elpaBuild + ellama = callPackage ({ elpaBuild , emacs , fetchurl , lib @@ -1997,12 +2006,12 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.7.0.20240223.201209"; + version = "0.8.13.0.20240316.161027"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.8.7.0.20240223.201209.tar"; - sha256 = "0b8b6qq9d14krxzrhwwh0g6xgpgxags8cr09b6bkpkrly4j3q08f"; + url = "https://elpa.gnu.org/devel/ellama-0.8.13.0.20240316.161027.tar"; + sha256 = "00pf48z90sirwyrk40p8fy9vi2cckrxismcp1yr8sirifs0wi574"; }; - packageRequires = [ dash emacs llm spinner ]; + packageRequires = [ emacs llm spinner ]; meta = { homepage = "https://elpa.gnu.org/packages/ellama.html"; license = lib.licenses.free; @@ -2030,10 +2039,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.0.0.20240221.104918"; + version = "1.0.0.20240323.170519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.0.0.20240221.104918.tar"; - sha256 = "121vvf8j9hs1z6lxz1v5r7r663k6kvzxnfd3xfgmipjfvax3ql85"; + url = "https://elpa.gnu.org/devel/embark-1.0.0.20240323.170519.tar"; + sha256 = "0mj762p6pbqciw1jjbn03qmcw7z4nc823ssd42jbx3a5mzvyi3qr"; }; packageRequires = [ compat emacs ]; meta = { @@ -2051,10 +2060,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.0.0.20240221.104918"; + version = "1.0.0.20240323.170519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240221.104918.tar"; - sha256 = "1ky6nsgzp73s94w7x1p00cly54gnmb763hrj7lx8k5ljc953zsd1"; + url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240323.170519.tar"; + sha256 = "0ys3v2519vw02c04vyl5jggk9n6nf2hzhb3xr8y635lg2f8chbh9"; }; packageRequires = [ compat consult emacs embark ]; meta = { @@ -2076,10 +2085,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.15pre0.20240216.193240"; + version = "0.15pre0.20240319.190705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240216.193240.tar"; - sha256 = "0bqvdz8rq63ac1szlvnk4aq1kafshc4kgyb91q941ndmpkd18gnj"; + url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240319.190705.tar"; + sha256 = "1g5bjg9z4k33pfvskv1nkxpzrp197rfwq4mpki74kmr9z7cmspaa"; }; packageRequires = [ emacs @@ -2105,10 +2114,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "18.0.20240211.172953"; + version = "19.0.20240318.161230"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-18.0.20240211.172953.tar"; - sha256 = "1y70n5f0xw05z5ri4gj13z5fyibygcff019zazmy3wq4idn2ff2z"; + url = "https://elpa.gnu.org/devel/emms-19.0.20240318.161230.tar"; + sha256 = "0yk3v3vglv8hl4x9piyis7q783gmbb49sw15zdgjys56plcg2k17"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2174,10 +2183,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20240216.195938"; + version = "5.6snapshot0.20240323.151032"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240216.195938.tar"; - sha256 = "0ap7kibpas9fwfsyail09v2zx9jkfa7hlj7fi0dr67a6jkqmgvya"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240323.151032.tar"; + sha256 = "1vydh0v3rw44r6y1lfbr4nlxhmbx224idj5s5g4kas6r2pgi0b74"; }; packageRequires = [ compat emacs ]; meta = { @@ -2209,10 +2218,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20240131.104105"; + version = "24.1.1.0.20240311.150545"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240131.104105.tar"; - sha256 = "0ky9n9kdqs4gsmwl3ah2lnw2qrmimrzfip1axrlbbk92n5dg6cvi"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240311.150545.tar"; + sha256 = "0dyyyl7akn50j15asr6msrx704vr4wjfz3a1h7nsxjjaczz0n8kz"; }; packageRequires = [ emacs ]; meta = { @@ -2306,10 +2315,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.28.0.20240212.225519"; + version = "0.28.0.20240316.164011"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240212.225519.tar"; - sha256 = "1ikp7q4cdss5isqrnl1iwlqwqgswh7sraz983ixdq706k1zsbcgr"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240316.164011.tar"; + sha256 = "0kqg4rfwrrd9z714a6k4ldmpq4iqihkx1c2q4fnf82p9616pd88w"; }; packageRequires = [ emacs xelb ]; meta = { @@ -2361,10 +2370,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.1.2.0.20240219.174103"; + version = "0.2.0.0.20240310.203607"; src = fetchurl { - url = "https://elpa.gnu.org/devel/filechooser-0.1.2.0.20240219.174103.tar"; - sha256 = "13rfqb0s3kw3llvgaxq27cdj8fihimihpaicsn5mq36yxbdcd0an"; + url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar"; + sha256 = "0ra072qdg38y92f73cimwlgcclvfpz4wvrr8wr7i808jv1rdagv7"; }; packageRequires = [ compat emacs ]; meta = { @@ -2822,10 +2831,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.7.0.20240223.114345"; + version = "0.9.19.0.20240315.175225"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.9.7.0.20240223.114345.tar"; - sha256 = "11kkp3x93yka54a68jjg0wpk51d3snf21wvamylk016w9sh3lls0"; + url = "https://elpa.gnu.org/devel/greader-0.9.19.0.20240315.175225.tar"; + sha256 = "1z58dr4zpb2pk10ppjrqr7bxzbji6bgajhv71s6i6802k8il7r32"; }; packageRequires = [ emacs ]; meta = { @@ -2848,17 +2857,14 @@ license = lib.licenses.free; }; }) {}; - gtags-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.0.0.20240124.174821"; + version = "1.1.0.20240313.5421"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.0.0.20240124.174821.tar"; - sha256 = "0j8i71z95y1crnfbcdpnrcwnfvpgcarvq1dqnmj7ic3fz40hd711"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.1.0.20240313.5421.tar"; + sha256 = "134h3w1gcvncm12yq6ls8xp8587r06vl7qr359rnkvc78sh07c9q"; }; packageRequires = [ emacs ]; meta = { @@ -3008,10 +3014,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.2pre0.20240222.73640"; + version = "9.0.2pre0.20240322.162839"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.2pre0.20240222.73640.tar"; - sha256 = "0j94qx0gmfh3n43jmca7zvr3j0sjc4nd2bxz5impgajq19l94wmj"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240322.162839.tar"; + sha256 = "14m1gnkbr9sg8i5bxwar71qs23i3wnqlfwf8cac76ihpminfzz1f"; }; packageRequires = [ emacs ]; meta = { @@ -3074,10 +3080,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.7.0.20231020.185704"; + version = "0.8.0.20240310.84654"; src = fetchurl { - url = "https://elpa.gnu.org/devel/isearch-mb-0.7.0.20231020.185704.tar"; - sha256 = "080qsg5ykjkzmir2pi4dij0ayjjiwlq8129rmv6777dld2a1pdrm"; + url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar"; + sha256 = "1n1lb1gcifd1m2pk4zgij3gd8500m4jhd6kgzrjy15cci34xlhsf"; }; packageRequires = [ emacs ]; meta = { @@ -3270,10 +3276,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.3.0.20240223.131200"; + version = "1.4.0.20240311.82108"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.3.0.20240223.131200.tar"; - sha256 = "1iyi3ayrjwp0xvsz4r03hwdlph0jw454xrlpy7j4spbwcq3s50yn"; + url = "https://elpa.gnu.org/devel/jinx-1.4.0.20240311.82108.tar"; + sha256 = "086231zh82hb2lz66m16hcvc7ncirn4zjx5hc5kmgzdp9aci8k8w"; }; packageRequires = [ compat emacs ]; meta = { @@ -3281,18 +3287,14 @@ license = lib.licenses.free; }; }) {}; - jit-spell = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: + jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "jit-spell"; ename = "jit-spell"; - version = "0.3.0.20230826.155115"; + version = "0.4.0.20240323.72834"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jit-spell-0.3.0.20230826.155115.tar"; - sha256 = "08aamxml469jkyxsrg7nalc3ajfps4i2a639hix45w4wv48s20zi"; + url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar"; + sha256 = "14lqji9qyki7yq1kr1hc1ikcphvk18js3mp1rwx239mh3v079f0n"; }; packageRequires = [ compat emacs ]; meta = { @@ -3308,10 +3310,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20240221.35415"; + version = "20231224.0.20240310.175505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240221.35415.tar"; - sha256 = "076jh8ldqmanb140cf4s381dwmlm0mr030ddqz7aaj790853vff2"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240310.175505.tar"; + sha256 = "1q99zwhk0cdlr161zi38sz412y69k7nh8wa6scz5mi4v07vjrr9g"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3341,10 +3343,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.24.0.20240121.142806"; + version = "1.0.25.0.20240312.132224"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.24.0.20240121.142806.tar"; - sha256 = "0fx1g76igs1bwcj6v3yxalwf57ggzvv1ms4gqid6ari6r3jp6c25"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240312.132224.tar"; + sha256 = "12x9i0m655nck41cv6kap814bzdw867wirnqbqyx8q80vmhxar9p"; }; packageRequires = [ emacs ]; meta = { @@ -3375,10 +3377,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.2.0.20240106.145829"; + version = "0.2.2.0.20240321.120430"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240106.145829.tar"; - sha256 = "16b0ilf3hqqlr9blc6vl1yc1y83hmfnxm0isl2f8rff29hw0k6y5"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar"; + sha256 = "11f82zrdf5fmpbfv076pg55d0pybjv13wyl62pymcgw1i1jjsach"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3466,6 +3468,40 @@ 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 = "08q7rkf2dxmwllpvm01v9bk7n0zynrqjmrsy3mrg4fnmdm9sw257"; + }; + 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 = "0nv50f4qa98cmj7r8azxbms6wbm1ij3bfld0fk1cqhn5b054ly0b"; + }; + packageRequires = [ lentic web-server ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic-server.html"; + license = lib.licenses.free; + }; + }) {}; let-alist = callPackage ({ elpaBuild , emacs , fetchurl @@ -3514,14 +3550,36 @@ license = lib.licenses.free; }; }) {}; + listen = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , persist + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.9pre0.20240322.72611"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/listen-0.9pre0.20240322.72611.tar"; + sha256 = "0k50isjazhx0hbmxw3s2p2ny56il5ywbsq1bda6av86ifzr1620c"; + }; + 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 }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.9.1.0.20240218.124933"; + version = "0.12.1.0.20240323.232518"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.9.1.0.20240218.124933.tar"; - sha256 = "1xdq5riyhxp5kff4v87mz5rr0df77ysmrc3vlarfhh12hg9bf3i4"; + url = "https://elpa.gnu.org/devel/llm-0.12.1.0.20240323.232518.tar"; + sha256 = "16y64vc84f14rcsbgg6cl0c9dc0xi0m2jks30m4l5khya7bkkj0x"; }; packageRequires = [ emacs ]; meta = { @@ -3615,10 +3673,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.1.1.0.20240117.25050"; + version = "1.1.1.0.20240224.55443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240117.25050.tar"; - sha256 = "10l1v429am4x65hk4f5sghql9vd5w1z163ld7za2sd9qv18dxf4z"; + url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; + sha256 = "10z609m2ak37yfbmlgv258j2rsvkq40h5rzmdwk8ibldz3n6ywgd"; }; packageRequires = [ emacs ]; meta = { @@ -3656,6 +3714,24 @@ 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 = "1scjp8f89a7mn7wlw0sgix8hk4dw6lpz0gakvfr7c5mcmm0bzhlr"; + }; + 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"; @@ -3679,10 +3755,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.5.0.20240105.70159"; + version = "1.5.0.20240323.201536"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240105.70159.tar"; - sha256 = "1x1n95scr1f6b3c6ymgi7hh7dl9z6ifiwgxyh29d657mn1sifxl9"; + url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240323.201536.tar"; + sha256 = "11sjdmif14bcl3cn2sn9a20lvyw8qrjqjscwcq0aid0lqwswmvi4"; }; packageRequires = [ compat emacs ]; meta = { @@ -3728,10 +3804,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.0.0.0.20240214.72309"; + version = "1.0.0.0.20240320.41315"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240214.72309.tar"; - sha256 = "0iqv403ikrj4fpbbs01wcmm94klifr71mlx6kb5n1cxf4i12f8s9"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240320.41315.tar"; + sha256 = "062mk5kqivhgvfk81rsa21bqkzk2h3wgfq1prjppndfw8y4cajpb"; }; packageRequires = [ emacs ]; meta = { @@ -3877,10 +3953,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20240223.71209"; + version = "4.4.0.0.20240322.51913"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20240223.71209.tar"; - sha256 = "0gvzgq2h7nkh77kg82jflpnrn5ilp6gmsl1jsg4gkcrhs0v36i1s"; + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240322.51913.tar"; + sha256 = "1ilblm5hgynihfm60q44fw9njhir1nndz7mhxbbsyhlm42bg30vc"; }; packageRequires = [ emacs ]; meta = { @@ -3888,6 +3964,21 @@ license = lib.licenses.free; }; }) {}; + mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "mpdired"; + ename = "mpdired"; + version = "2pre0.20240319.164728"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240319.164728.tar"; + sha256 = "18xhxlxzl5kapjzhaqw0zsi5avp2wb0vrxj9rsigsjcr0p09asrd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mpdired.html"; + license = lib.licenses.free; + }; + }) {}; multi-mode = callPackage ({ elpaBuild , fetchurl , lib }: @@ -4031,10 +4122,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.1.0.20240120.114819"; + version = "1.0.1.0.20240318.92455"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240120.114819.tar"; - sha256 = "0m4zs3l3q077v0g1vp1z0kbddgb3cwvnd7i50f4ih9pjiymgjvkc"; + url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240318.92455.tar"; + sha256 = "1ncbyq2753s46aca2kklf5rrgccc1wddbp0qbhcn6v2j1y37c8k5"; }; packageRequires = [ emacs ]; meta = { @@ -4049,10 +4140,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.3.4.0.20230421.53238"; + version = "0.3.4.0.20240319.93238"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20230421.53238.tar"; - sha256 = "04fmfzy965d6wbaxgpkgyxaw9qv6103gc9g8kw1gcvbxdgq0rf56"; + url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar"; + sha256 = "0i7zxx2y052bn4ry3pr24zmm846zilcvv2pvkzcd450zp84p39hn"; }; packageRequires = [ emacs ]; meta = { @@ -4296,10 +4387,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20240221.100116"; + version = "1.1.0.20240320.163827"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20240221.100116.tar"; - sha256 = "1qg94gy3f7f49xfnqxl5315gr55rm8crpp7l5jkw3ha6d4n7cjvl"; + url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240320.163827.tar"; + sha256 = "1iffr6y533z310c47jig8fbg6vyv9a6vlrwn5v4rg0vb3m0i1ah7"; }; packageRequires = [ emacs ]; meta = { @@ -4311,10 +4402,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240223.132445"; + version = "9.7pre0.20240324.161811"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240223.132445.tar"; - sha256 = "1va7l4h4lbajwzvmvj5w9fx148ixbzbagbhjjlqmg0kccsamx8qj"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240324.161811.tar"; + sha256 = "02c2zy96ipzyl6abn375zkvsybfbs3067mnv70xrgjhfrd02yfbr"; }; packageRequires = [ emacs ]; meta = { @@ -4388,10 +4479,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.1.0.20240102.32915"; + version = "1.2.0.20240316.110902"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.1.0.20240102.32915.tar"; - sha256 = "0vp610bjjz885bb16kc7lv7k4h2fir8mvcs3jhvwrddbhyi4hycq"; + url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240316.110902.tar"; + sha256 = "1jxq281qpr8if9np3qsg8gccg08yzi7szq0vz5v8yy7q4lc27wz2"; }; packageRequires = [ compat emacs ]; meta = { @@ -4445,10 +4536,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1.0.20240201.154838"; + version = "1.2.1.0.20240323.220226"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240201.154838.tar"; - sha256 = "150zkg15y8zafjhwrwf2p5fng5287mh8n452a5gk47ikf0jsx7b0"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240323.220226.tar"; + sha256 = "0vw0arm7jhzrxwfjyqj65xicbr6020k106vb7zaw1iyvwq64fid7"; }; packageRequires = [ emacs org ]; meta = { @@ -4693,10 +4784,10 @@ elpaBuild { pname = "phpinspect"; ename = "phpinspect"; - version = "0.0.20230831.151323"; + version = "0.0.20240322.152749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phpinspect-0.0.20230831.151323.tar"; - sha256 = "01qhyjs9ziz6qk652ibvwjzpbzd1a9038jrmxx79mj39yai4lwca"; + url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar"; + sha256 = "1cm8m3zvqd000zv88md4qnrjlq29x8kl1zsivb1k4q6b0rxpva4g"; }; packageRequires = [ compat ]; meta = { @@ -4836,10 +4927,10 @@ elpaBuild { pname = "popper"; ename = "popper"; - version = "0.4.6.0.20230908.183054"; + version = "0.4.6.0.20240323.172152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20230908.183054.tar"; - sha256 = "062ykss5kv0w1i254n9lzwkfwf5zliicianh1nvypmlqdp16hphx"; + url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar"; + sha256 = "14k8shc3w1kc8yz3i1rm02qdyjkxbyyypl2phm9650dvwhwxibxg"; }; packageRequires = [ emacs ]; meta = { @@ -4869,10 +4960,10 @@ elpaBuild { pname = "pq"; ename = "pq"; - version = "0.1.0.20220719.42000"; + version = "0.2.0.20240317.135839"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pq-0.1.0.20220719.42000.tar"; - sha256 = "11anvvmsjrfcfcz5sxfd40gsm6mlmc9llrvdnwhp4dsvi2llqv65"; + url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; + sha256 = "0hfngsg0hqqrkm55q0ds09bprbpf7km7ry0s4y2lmvyybfaszkla"; }; packageRequires = [ emacs ]; meta = { @@ -4905,10 +4996,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20240215.181437"; + version = "0.10.0.0.20240315.22845"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240215.181437.tar"; - sha256 = "1pp3al6yydv4wpqc2bz2ccak8na38x35i0z1vi999ir232mpdaa5"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240315.22845.tar"; + sha256 = "0l0aqa5xyj1wj3wxvbvyjx32cjq405dkp10fmy9ydb80a44l8jyw"; }; packageRequires = [ emacs xref ]; meta = { @@ -4997,10 +5088,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20240223.100931"; + version = "0.28.0.20240314.140956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240223.100931.tar"; - sha256 = "1x97iqsg2jnhr23l81dlipz5xwf0g8mlw9yqqz02rjc8s112awsv"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20240314.140956.tar"; + sha256 = "1ikh9qj1dd7002wxfgppngja32yw81i799ymsxwgrypy3xidxxpa"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5114,10 +5205,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.3.0.20240215.94754"; + version = "0.1.4.0.20240226.165830"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-sqlite-0.1.3.0.20240215.94754.tar"; - sha256 = "169d4pb204jns39p2xbh37psy9pyi6yhiywlm7ywn2c4fagwj2q2"; + url = "https://elpa.gnu.org/devel/rcirc-sqlite-0.1.4.0.20240226.165830.tar"; + sha256 = "1j16p0i9yyv229f4jcq10vwld01yda6gdv7n5a0ap0xk5qhaj67k"; }; packageRequires = [ emacs ]; meta = { @@ -5395,10 +5486,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "6.0.20231204.173138"; + version = "7.0.20240306.83828"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rt-liberation-6.0.20231204.173138.tar"; - sha256 = "0z6988s3hnbh4l5crn3m1ilz94dvsi8d11khjb45qdkmdpzvdmh3"; + url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar"; + sha256 = "1bykgygci149vn2s722xg5bn0kp6srjb8mf5rygvy5h32lfdc4r9"; }; packageRequires = []; meta = { @@ -5560,10 +5651,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.4.2.0.20230311.131100"; + version = "2.4.2.0.20240313.182825"; src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20230311.131100.tar"; - sha256 = "03nlyl4r5dm2hr3j0z1qw3s2v4zf0qvij350caalm08qmc9apama"; + url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar"; + sha256 = "06yffzhfjgbqr4nsk1f098qmr72818n8466i2g75j03vmzacbzgd"; }; packageRequires = [ emacs ]; meta = { @@ -5627,10 +5718,10 @@ elpaBuild { pname = "site-lisp"; ename = "site-lisp"; - version = "0.1.2.0.20240221.82209"; + version = "0.1.2.0.20240308.82403"; src = fetchurl { - url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240221.82209.tar"; - sha256 = "0jx7lqwrbvwk2cyznd2rfapnvs6k3kaz6kwyd9508kxv2y521gz2"; + url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar"; + sha256 = "0hc811pinqr9swg9764aibyfar33n8nk733pzfgn70rdyxszl9h5"; }; packageRequires = [ emacs ]; meta = { @@ -5815,10 +5906,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.3.0.0.20240222.124225"; + version = "0.4.1.0.20240311.74539"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.3.0.0.20240222.124225.tar"; - sha256 = "072biw4a146d7064j1zqi03nh7aiy465bna11sk102x90mhs9z25"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.4.1.0.20240311.74539.tar"; + sha256 = "1alvy1am8fjlj0wlmzbpvjjgjcln25v0dc19rbwfgwm8pzbq2apn"; }; packageRequires = [ emacs ]; meta = { @@ -5883,10 +5974,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.7.0.20230922.224618"; + version = "1.7.0.20240323.40057"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20230922.224618.tar"; - sha256 = "1clffdk29mq5cbgjw5if2sfmx1dvvhn10lapnrpfz560r2lfykvg"; + url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar"; + sha256 = "1gvb4inym802zjx721l7qwwmvahaqaw0v1qkm3kl36nqcx7ykp52"; }; packageRequires = [ cl-lib ]; meta = { @@ -5949,10 +6040,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.0.1.0.20240212.80249"; + version = "2.0.1.0.20240226.81513"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240212.80249.tar"; - sha256 = "1k4285xpdlhhbmn4516jv2kwn5x82mah23jwlr9qhb4hxvzjmkms"; + url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240226.81513.tar"; + sha256 = "1c4rqg59823syxd9izz8spi54yf0p2984vnpkk7r1kklzfszglmf"; }; packageRequires = [ emacs ]; meta = { @@ -6369,10 +6460,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.1.0.20240130.101154"; + version = "2.6.2.2.0.20240228.151226"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.2.1.0.20240130.101154.tar"; - sha256 = "0rlzqwcmcifcg64sbabs8fnrbx4s5vvkqwdwf963pji5fi2n60di"; + url = "https://elpa.gnu.org/devel/tramp-2.6.2.2.0.20240228.151226.tar"; + sha256 = "0cv1mwksfcggsyv38kmldcxb702mv7kl4f5l20ilkypsl8ryjfyy"; }; packageRequires = [ emacs ]; meta = { @@ -6442,10 +6533,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.5.3.0.20240201.110006"; + version = "0.6.0.0.20240321.220938"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.5.3.0.20240201.110006.tar"; - sha256 = "07hg1bas7zvs6hxq189wp5ngi71skydal2h6q4xsv28ac7mi268g"; + url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240321.220938.tar"; + sha256 = "0ircfdybzzjxalcfcmd889b41c647fqdwybylri52hz3wh13iix4"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6479,10 +6570,10 @@ elpaBuild { pname = "tree-inspector"; ename = "tree-inspector"; - version = "0.4.0.20230925.193758"; + version = "0.4.0.20240322.113138"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20230925.193758.tar"; - sha256 = "0ncg9yhngzn7cspqna62i21v8rra4hczpz74xckgzs34s98mv4y7"; + url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar"; + sha256 = "0ic17jzzj5mqzdpg6hvwyas9s70jpqgfc96azmmb3mhpvs6xwak2"; }; packageRequires = [ emacs treeview ]; meta = { @@ -6620,10 +6711,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.0snapshot0.20240124.145836"; + version = "0.4.2snapshot0.20240310.204507"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.4.0snapshot0.20240124.145836.tar"; - sha256 = "1bi6hvkpcdk3kjdzj14lndsyxhl2bcscx57ggl6wmix7ga0bc8za"; + url = "https://elpa.gnu.org/devel/urgrep-0.4.2snapshot0.20240310.204507.tar"; + sha256 = "0pzicsyp8p2cbyy77l0fj7kzi7amc5xqyj6a6in1jvgc52wzg532"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6840,10 +6931,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628.0.20240102.22814"; + version = "2024.3.1.121933719.0.20240314.104026"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20240102.22814.tar"; - sha256 = "0zp9nasy8vd3b047bjpiyvl2c0l4k03nbba4yga5a77jkg7mzsh1"; + url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar"; + sha256 = "14v14yn6lcpjxldmzl9wymikxzli4mpvy9xsa0pvq0dlj0d30xgw"; }; packageRequires = []; meta = { @@ -6855,10 +6946,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.7.0.20240212.231900"; + version = "1.7.0.20240322.111445"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240212.231900.tar"; - sha256 = "0rhl6brd5h0l0bq3izy4114gaj8qm88ldx6x9a9ixa0kjjx2pc6a"; + url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240322.111445.tar"; + sha256 = "1v4c3h9qv1mr4dwirzh5r6vvkbxhxqw4cq245vla0ljgl9bhsm86"; }; packageRequires = [ compat emacs ]; meta = { @@ -7060,10 +7151,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.0.0.20240220.203830"; + version = "3.6.0.0.20240312.163350"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240220.203830.tar"; - sha256 = "1pp40cm6a46pdpljzfrx70vszmynr1flzlwzv2ky1zf5yv6wacq4"; + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240312.163350.tar"; + sha256 = "09mjn8ms7yhy93b3klqhvwvk2ipk4fx6l9s7446m7fxjdylgbj6a"; }; packageRequires = [ emacs ]; meta = { @@ -7078,10 +7169,10 @@ elpaBuild { pname = "window-commander"; ename = "window-commander"; - version = "3.0.2.0.20240212.12958"; + version = "3.0.2.0.20240314.125442"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240212.12958.tar"; - sha256 = "02v3m4qrwzxdlsfdjh35bazcdfn92s6qjh8q7jqfnhv3i2b80jx6"; + url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar"; + sha256 = "1bjamqhn8nkqxmak1xfxriwqjhb0bdj7ldcg6r24rral0f0crwhm"; }; packageRequires = [ emacs ]; meta = { @@ -7128,10 +7219,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.3.2.0.20231026.105332"; + version = "4.3.2.0.20240313.173240"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20231026.105332.tar"; - sha256 = "1jlqvimnjsdvaylfj2hq9k9bllvl74j1g4pd8w4kf3c30n7jyiql"; + url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar"; + sha256 = "0cd7y0wg52yz8bp74m9p9wnw4zhsgks61znxxm8y0mjxxac4g188"; }; packageRequires = [ emacs seq ]; meta = { @@ -7307,10 +7398,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20240215.153445"; + version = "0.14.1.0.20240308.31533"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240215.153445.tar"; - sha256 = "121b54xh9jsqcb2x1a5r9nd1c3i5ayka932xd47z09ps46zlvpsr"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240308.31533.tar"; + sha256 = "0n67qgrnjxv5vb1brc545b4jyan7adx4r8478mw3686ia014l1kh"; }; packageRequires = [ cl-lib emacs ]; meta = { 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 3d0073bf81432..00f50233d50f1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -83,6 +83,18 @@ self: let rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile ''; }); + + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); }; elpaDevelPackages = super // overrides; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 25831b16cc4a5..ec8e192397a2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -34,10 +34,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.5.1"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/activities-0.5.1.tar"; - sha256 = "0ng9sgajcpal881s3kavkmz0fc38f2h207hpqj62cf14z7bsk0zk"; + url = "https://elpa.gnu.org/packages/activities-0.7.tar"; + sha256 = "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi"; }; packageRequires = [ emacs persist ]; meta = { @@ -261,6 +261,21 @@ 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 = "0ixs6ab5j12q69bn9h423a6c7mpc7r5spf6m039x3rl14yc04cy4"; + }; + 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"; @@ -280,10 +295,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.3"; + version = "14.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.3.tar"; - sha256 = "1xk29nk3r7ilxk2vag3diacamqvlws7mbjk5a0iivz5y6fy7hmjc"; + url = "https://elpa.gnu.org/packages/auctex-14.0.4.tar"; + sha256 = "03w6qs4f0ksb8f54zsx189775w3wdyfaqg3dwn20a77y5cvisk52"; }; packageRequires = [ emacs ]; meta = { @@ -550,10 +565,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.88.22.2"; + version = "5.90"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.88.22.2.tar"; - sha256 = "1i4sdm8kcrazzp22gb4hi1gd4lfq6hdh6pnldmi1zjjyhl1gbzn3"; + url = "https://elpa.gnu.org/packages/brief-5.90.tar"; + sha256 = "18v0qf3aj14sh6njrrjdahzaghsqy50hdjrwl3k1m7x2jqvzxd1z"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -565,10 +580,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-env-0.5.tar"; - sha256 = "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p"; + url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar"; + sha256 = "08li070s2s64lifgzns0z6xjk1qyaik56d6sbdp3gsyghc1sx7rn"; }; packageRequires = [ compat emacs ]; meta = { @@ -659,10 +674,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.3.tar"; - sha256 = "1178f6js821zcmsc3zrlclnaf4sswgvzs2qazzi975dkcfqcn3vq"; + url = "https://elpa.gnu.org/packages/cape-1.4.tar"; + sha256 = "1y0b0lx6qb27x3d0yn3gxykfir07cw4w5jkkw3ff8x1ak6wrf4zv"; }; packageRequires = [ compat emacs ]; meta = { @@ -809,10 +824,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/comint-mime-0.3.tar"; - sha256 = "0dlzwzmiwq9z8riq6h1gpq1g713x09kxgaz2m4anxkbmgb95r7hf"; + url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; + sha256 = "1wgr1dq3qdnsvziylcqaiwhjafdqph4jrnq4cp0lcr1j796vp1dz"; }; packageRequires = [ emacs ]; meta = { @@ -907,10 +922,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.4"; + version = "29.1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.4.tar"; - sha256 = "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar"; + sha256 = "191cjzrw9xm5bvcf8s1yr9hdcn9i02789xfd8pz33lk65s0rq413"; }; packageRequires = [ emacs seq ]; meta = { @@ -922,10 +937,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.3.tar"; - sha256 = "1qyqvc4rp0287lidpzhvi669ygjnqmlw8wq0hc0nks2703p283c8"; + url = "https://elpa.gnu.org/packages/consult-1.4.tar"; + sha256 = "1vxc9i4jwnq4q8svgqjzn6nqqjzh3b6gp81iyfcr5n2122y0aq1y"; }; packageRequires = [ compat emacs ]; meta = { @@ -933,8 +948,7 @@ license = lib.licenses.free; }; }) {}; - consult-hoogle = callPackage ({ consult - , elpaBuild + consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl , haskell-mode @@ -942,12 +956,12 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.1.1.tar"; - sha256 = "1bcl7h5ykcgrsfj27wkv9l9jvbj2bbkh0w9d60663m1bkp0p3y2r"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.0.tar"; + sha256 = "1wzd7i7sfd1l8fkfgfaj5vyc9nx9aycfr4yp5yxg1mr6fz8m2rmz"; }; - packageRequires = [ consult emacs haskell-mode ]; + packageRequires = [ emacs haskell-mode ]; meta = { homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; license = lib.licenses.free; @@ -1152,10 +1166,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.7.0"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.7.0.tar"; - sha256 = "0fbafwmrs9dlv875vcg1c9gh0hqs1zpnyqxgkdvbrazww7ffn60g"; + url = "https://elpa.gnu.org/packages/dape-0.9.0.tar"; + sha256 = "13xvl24l8lr64ndc8rk1dxdgsbvwxhn90844xkdzl7qs8i3hyw1l"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1242,10 +1256,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.2.4.tar"; - sha256 = "0a0f4s715nfb7kly82m1gb2ady69z089wlay5i53n9bxzi61x3j7"; + url = "https://elpa.gnu.org/packages/denote-2.3.0.tar"; + sha256 = "0h6pdn9w1ggyrmfniqvy307wnlf49n05asa2z5wqxvj6mnvjza1y"; }; packageRequires = [ emacs ]; meta = { @@ -1287,10 +1301,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.5.tar"; - sha256 = "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka"; + url = "https://elpa.gnu.org/packages/devdocs-0.6.tar"; + sha256 = "17av2l61mr4y8la4cqiq1dnaznni4xirr5k3wdix1jzl3q1apypy"; }; packageRequires = [ emacs ]; meta = { @@ -1653,10 +1667,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240205"; + version = "20240309"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20240205.tar"; - sha256 = "06psmcf3yi7pincsbhjrcrml0wzwgmlv6xy2fbpg1sg8vlibbgi3"; + url = "https://elpa.gnu.org/packages/eev-20240309.tar"; + sha256 = "0j9hz5raxrk3d2ashbsp9yvi04d5ap0chb4lpljr4pbh2lnyjr4h"; }; packageRequires = [ emacs ]; meta = { @@ -1668,10 +1682,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.5.1.tar"; - sha256 = "00qh5b7kx0dlms7drnzj95mvgwfzg5h5m9prkbr8qi4ssx939gdw"; + url = "https://elpa.gnu.org/packages/ef-themes-1.6.1.tar"; + sha256 = "1ms0rqivxdsbx7jv6d5h1khvm4ghml152ab831chg4z77apmq1ga"; }; packageRequires = [ emacs ]; meta = { @@ -1778,22 +1792,16 @@ license = lib.licenses.free; }; }) {}; - ellama = callPackage ({ dash - , elpaBuild - , emacs - , fetchurl - , lib - , llm - , spinner }: + ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }: elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.7"; + version = "0.8.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.8.7.tar"; - sha256 = "0qmd7zrh026rjic26bdp9zinb7vkppdm14inwpwaashqxa5brwi5"; + url = "https://elpa.gnu.org/packages/ellama-0.8.13.tar"; + sha256 = "012j3rnvwj8ajyjdlgdx6nrs773i71dyl5brs0jgx010jibzmafi"; }; - packageRequires = [ dash emacs llm spinner ]; + packageRequires = [ emacs llm spinner ]; meta = { homepage = "https://elpa.gnu.org/packages/ellama.html"; license = lib.licenses.free; @@ -1893,10 +1901,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "18"; + version = "19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-18.tar"; - sha256 = "1jslk37kx7yzvwy4hq1a6b71kp4a3bgfzzp8bpplv7z6vcmwrmgq"; + url = "https://elpa.gnu.org/packages/emms-19.tar"; + sha256 = "13c884s92ddn52psgkaz3zvb94g23gq41dbidpx7x4gzdhd9qqxm"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2125,10 +2133,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/filechooser-0.1.2.tar"; - sha256 = "0s0mdc851zd2hy8hfpbamiimbh7c788cyz8mxnwzkpmf6jlj6xdw"; + url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar"; + sha256 = "1pl6n6d6gymdm0gx0nz96hwps8v1s2zpqph41d0h5hdvsvxacx6w"; }; packageRequires = [ compat emacs ]; meta = { @@ -2554,10 +2562,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.7"; + version = "0.9.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.9.7.tar"; - sha256 = "08q2qfcwyxrnmjbzblgk16xhshhn2314swjs0kr5jrdijdgpfghh"; + url = "https://elpa.gnu.org/packages/greader-0.9.19.tar"; + sha256 = "1d04d1shzb505qs2mf7387dvl56pwlwh4b349s5fq2prwqrq71l7"; }; packageRequires = [ emacs ]; meta = { @@ -2584,10 +2592,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.0.tar"; - sha256 = "0nyzsr3fnds931ihw2dp5xlgv151kzph7qv1n751r1cajimzlp7n"; + url = "https://elpa.gnu.org/packages/gtags-mode-1.1.tar"; + sha256 = "0fgs6iqrivmyxfkjl6hxxs3zfjkkdas61z34q08qfjgw0ixz188h"; }; packageRequires = [ emacs ]; meta = { @@ -2726,10 +2734,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-9.0.0.tar"; - sha256 = "07kpyp3ggf4knakn18niy819l184apx4d9vbcwv57j8zyqgn4c3l"; + url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar"; + sha256 = "0a7py2dvszh0rf2smbmm8msjrc8vbbvlqnsqw0m2l12v8vllmxnb"; }; packageRequires = [ emacs ]; meta = { @@ -2786,10 +2794,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.7.tar"; - sha256 = "1dfjh4ya9515vx0q2dv1brddw350gxd40h1g1vsa783ivvm0hm75"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar"; + sha256 = "06241rwz01z4ysgmizczq12zl0cc6xvfyds48glzk1jp82zp4adp"; }; packageRequires = [ emacs ]; meta = { @@ -2956,10 +2964,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.3.tar"; - sha256 = "0xlfw1sw92qf8bwpw9qnjhkz4ax6n7kcl72ypqm3swmj92jbgsg7"; + url = "https://elpa.gnu.org/packages/jinx-1.4.tar"; + sha256 = "1vv85pbhcpwjvd3iwnr8ksjpbydrsk7m3zm34hcbybg703yk2nl7"; }; packageRequires = [ compat emacs ]; meta = { @@ -2971,10 +2979,10 @@ elpaBuild { pname = "jit-spell"; ename = "jit-spell"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jit-spell-0.3.tar"; - sha256 = "0q8wd9phd0zcjhc92j633vz82fr0ji8zc9vir7kcn1msrf6jspwz"; + url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar"; + sha256 = "1p83spcq52l7k63p56y3w5r3kl49wbrs4abynwn25ikhkd4wl8x3"; }; packageRequires = [ compat emacs ]; meta = { @@ -3016,10 +3024,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.24"; + version = "1.0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.24.tar"; - sha256 = "05nwxfybczxx7pmflq762dq3wypm3pmcfljqs5kh81icxvdqvk8s"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar"; + sha256 = "0hlc70xlm3a53il7k24s6s25dhnd09l2454r5qkpfnjdz9p5ih6f"; }; packageRequires = [ emacs ]; meta = { @@ -3137,6 +3145,40 @@ 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 = "15sb126sq5aw3n09vqydmsl1l5svfar70iz42hnqi783cpw1lh0m"; + }; + 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 = "1vifs91r4rm57rka8by50f8zg5pr2hjqwbdz28mbbxhkj3war6s5"; + }; + 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"; @@ -3182,14 +3224,36 @@ license = lib.licenses.free; }; }) {}; + listen = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , persist + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/listen-0.8.tar"; + sha256 = "1vj9fsyp5v1qh87asj23k625080x6c8mgkas4933lrz7l2g7h1y2"; + }; + 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 }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.9.1"; + version = "0.12.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.9.1.tar"; - sha256 = "0vib0zl41fsacc5d79f1l52j2vxnbqc37471b86cxw9rha0clr8m"; + url = "https://elpa.gnu.org/packages/llm-0.12.1.tar"; + sha256 = "11z56fqp0y13jmvm2611xyqsz41k01rsqdjvrzvbf33n56vsw713"; }; packageRequires = [ emacs ]; meta = { @@ -3317,6 +3381,21 @@ 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 = "1mb03hrszxxsk61yvh70rnkn7iiwx1vx6n1br02clkpn2q2c0mq5"; + }; + 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"; @@ -3516,10 +3595,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.3.0.tar"; - sha256 = "0zsglzqc36bw9r7fgvxjdcrdjar6xwad29kwyqd2k36bq3pivzq3"; + url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; + sha256 = "1n6fmgj2kpdy2mmwg5hh6dic30zy0gd3ap6hlipl9qn08lawbbgq"; }; packageRequires = [ emacs ]; meta = { @@ -3527,6 +3606,21 @@ 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 = "1b7xsdgsrwy7qkshkk83bizz9r78g4pdfnavwl6riyb947gk6zkx"; + }; + 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"; @@ -3900,10 +3994,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.0.tar"; - sha256 = "0kslgrs857h3mm837hcb8v52ankbv0hm2pz0q136imckzj32m43s"; + url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; + sha256 = "19iy0ps8h1qjh16mdybayd9i25bn27sa2slqsa6nslh251pxc0rk"; }; packageRequires = [ emacs ]; meta = { @@ -3915,10 +4009,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.19"; + version = "9.6.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.19.tar"; - sha256 = "0ibgw0i7nsn589k0ynifwdp1f3ia6p8369myhjqgmwy392cwrcxg"; + url = "https://elpa.gnu.org/packages/org-9.6.23.tar"; + sha256 = "0yqn3kag4anzm8ahfgjxrxjndzq6rbs6kayfq93gx4rn0qxa334q"; }; packageRequires = [ emacs ]; meta = { @@ -3975,10 +4069,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-1.1.tar"; - sha256 = "1aclips7y3dasjh6rjdcx1b6fkaripjam6120b7wm487qpjcrzc8"; + url = "https://elpa.gnu.org/packages/org-modern-1.2.tar"; + sha256 = "1kgvrsmbgadbr7wk48sgx1prlgpbp31nih9bl9div35d496njcnw"; }; packageRequires = [ compat emacs ]; meta = { @@ -4376,6 +4470,21 @@ 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 = "0gy3i2l1fxwpav6l57yf3mml15lhwh9xp8sm40hlpgyn15nyz4c6"; + }; + 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"; @@ -4575,10 +4684,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.3.tar"; - sha256 = "1pwxkw6dzwbg5g3rxilpp6iy3mzxgpn0mw59i3dcx25hdyizqhip"; + url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.4.tar"; + sha256 = "0hz0nm35jq6fg9pr4j725r2awxbf1q23bzn85nhcbpafzb8mmajl"; }; packageRequires = [ emacs ]; meta = { @@ -4845,10 +4954,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "6"; + version = "7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-6.tar"; - sha256 = "1l87q2h1hqm5zpg1fz835gmbf5fgl9fvcqg42c17v6kim4has8zd"; + url = "https://elpa.gnu.org/packages/rt-liberation-7.tar"; + sha256 = "0gb1an3a68ib27jrc8x8grq5z3xya4b1gl8ii82a1clzf87n7k63"; }; packageRequires = []; meta = { @@ -5215,10 +5324,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.3.0.tar"; - sha256 = "1iiaxgl18k8hkwwyz3qnargv6q8kwzyh39ai46k5xbpmyrsj4b16"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.4.1.tar"; + sha256 = "02bc0r20b4mgnlzryq26q0jq45wfgpvv7y3zhvnaaqj11rw7779f"; }; packageRequires = [ emacs ]; meta = { @@ -5689,10 +5798,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.1"; + version = "2.6.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.2.1.tar"; - sha256 = "145riknpdvw7rvpz20m766yci3w012f241mw38pbbb9cb8pn2rbf"; + url = "https://elpa.gnu.org/packages/tramp-2.6.2.2.tar"; + sha256 = "0bbsff2qr71f70nxhdi19b3jzpv6bgfb7x7qkrccsygvsvgyrb2h"; }; packageRequires = [ emacs ]; meta = { @@ -5749,10 +5858,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.5.3"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.5.3.tar"; - sha256 = "12ak6rykg627rkwwiga5d9g9pzcrq2sliynqbr3lm8rvlwbdhkhx"; + url = "https://elpa.gnu.org/packages/transient-0.6.0.tar"; + sha256 = "1lsh8cvg1kspa8gl9fml0x7r61fbhjajmjqjf4r2s7qz102z66xb"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5899,10 +6008,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.4.0.tar"; - sha256 = "0l0gswml6hkna48gfljj3hajhcx3bbc1rqwb2v01hvqab05an7zs"; + url = "https://elpa.gnu.org/packages/urgrep-0.4.1.tar"; + sha256 = "1kwcb7xxk9lcby5s8gpd5dchya7qq063j217rxsjyn8vv9z91lfc"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6106,10 +6215,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628"; + version = "2024.3.1.121933719"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2023.6.6.141322628.tar"; - sha256 = "14qls4v5yxrgyiimvvggimw5ddlx0ll387a1r6awm274rj4p3d19"; + url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; + sha256 = "047kna2j1mbsibw1psxdp8qmg91dnjrdrskdzhys9pmaqggfl5ry"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 0b142281559a9..18a0a36fc06cb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -63,9 +63,6 @@ self: let cl-print = null; # builtin tle = null; # builtin advice = null; # builtin - seq = if lib.versionAtLeast self.emacs.version "27" - then null - else super.seq; # Compilation instructions for the Ada executables: # https://www.nongnu.org/ada-mode/ ada-mode = super.ada-mode.overrideAttrs (old: { @@ -174,6 +171,18 @@ self: let ''; }); + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 9a908039b8f5c..02cf40eb96392 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -85,6 +85,8 @@ in 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 { }; 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 index 2533153bd4474..7418a842148a7 100644 --- 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 @@ -1,21 +1,23 @@ { trivialBuild , haskellPackages }: - -trivialBuild rec { +let + Agda = haskellPackages.Agda.bin; +in +trivialBuild { pname = "agda-mode"; - version = haskellPackages.Agda.version; + version = Agda.version; dontUnpack = true; # already byte-compiled by Agda builder buildPhase = '' - agda=`${haskellPackages.Agda}/bin/agda-mode locate` + agda=`${Agda}/bin/agda-mode locate` cp `dirname $agda`/*.el* . ''; meta = { - inherit (haskellPackages.Agda.meta) homepage license; + 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. 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 new file mode 100644 index 0000000000000..cd449ab0f5d9a --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -0,0 +1,19 @@ +{ lib +, trivialBuild +, texpresso +}: +trivialBuild { + pname = "texpresso"; + version = texpresso.version; + src = texpresso.src; + + preInstall = '' + cd emacs + ''; + + meta = { + inherit (texpresso.meta) homepage license; + description = "Emacs mode for TeXpresso"; + maintainers = [ lib.maintainers.alexarice ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 8f2e093ddf8d1..c9a699f5a06b0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -64,10 +64,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.1.0.tar"; - sha256 = "07q8s3qi3lm8g01ypvqqq0cn5jx5jrgyv74fbfam3mmz5l3mqp6q"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.2.0.tar"; + sha256 = "1h1whavdrwfsc79kcvh2vbvjzqd7n01xzjb1acgyiy9wkyl79p7b"; }; packageRequires = []; meta = { @@ -306,10 +306,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.33"; + version = "1.34"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.33.tar"; - sha256 = "0245fq4iny1jnm440dzkq0fadw10ncnhkj28mayqs9iyyzj9g5h4"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.34.tar"; + sha256 = "0bdlky9d5fzc9x9wpjxyvrclz1rmzsnvc89lf0m5fhyp4r8jvxy4"; }; packageRequires = [ emacs ]; meta = { @@ -459,6 +459,26 @@ 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 = "0901wliqdzj5dmam1kkbq0nxhywqf11182q7yxjxh98czy5w3xh8"; + }; + packageRequires = [ consult emacs flycheck ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-flycheck.html"; + license = lib.licenses.free; + }; + }) {}; corfu-terminal = callPackage ({ corfu , elpaBuild , emacs @@ -479,16 +499,16 @@ license = lib.licenses.free; }; }) {}; - crux = callPackage ({ elpaBuild, fetchurl, lib, seq }: + crux = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "crux"; ename = "crux"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/crux-0.4.0.tar"; - sha256 = "01yg54s2l3zr4h7h3nw408bqzrr4yds9rfgc575b76006v5d3ciy"; + url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar"; + sha256 = "0zdzfglzvhkzyvnkk2d217c6f8gnbcxlp8adimwrxgqh7c6gwihp"; }; - packageRequires = [ seq ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/crux.html"; license = lib.licenses.free; @@ -742,10 +762,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.5.1.tar"; - sha256 = "0687npypihavghz9bjs8f6h10awjgjv5fdd11dmh43p1krhrga2w"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar"; + sha256 = "0pa8y3zc768wdgp43546qvwr6ly2q9gznfrl6qmm90gkv5wrc5ln"; }; packageRequires = [ emacs ]; meta = { @@ -2682,10 +2702,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240219.135847"; + version = "1.0.20240319.160226"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240219.135847.tar"; - sha256 = "06g1ci7kq8fxjh65qwwnh530xvvh6pr9ha52f7xmbjf56iifn1da"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240319.160226.tar"; + sha256 = "1alqiagpkbxqi8nyrn1qzfx23fagpn1ml9hqpyj897jwf5f03zsh"; }; packageRequires = [ emacs ]; meta = { @@ -3382,10 +3402,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.6.0"; + version = "2.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.0.tar"; - sha256 = "1gpjby6g9wq8p25q1a35hr56nfb4sbcdrf0bjxidh1diw5g5saw4"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.2.tar"; + sha256 = "13z87xyzldllvga8iygb33qaqvrrc2qnc315zalvbmydw174cq1i"; }; packageRequires = [ emacs ]; meta = { @@ -3397,10 +3417,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.18"; + version = "17.3.19"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.18.tar"; - sha256 = "18ylzq12gsayp3cmd8qjdqsnyiymjd95ffqs3xcyva6sl8d41hmy"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar"; + sha256 = "1z33y7p1dilwpwydb9q14n55q48n80mynm7fjr7ih91wvk8zz5di"; }; packageRequires = [ emacs ]; meta = { @@ -3560,10 +3580,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.21.20240220095736"; + version = "24.24.20240324101507"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.21.20240220095736.tar"; - sha256 = "04ra1m9mwhz3zh0776gbzfn4kn0yxgbfbh1hq78r2zxggvpjfikv"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.24.20240324101507.tar"; + sha256 = "1lqrrs5j523q33vvs85j3dlnd56bmnzglfkc8jilv6yq44dmv7v7"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 016ccf1dfc43c..659d82c088dfe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -95,24 +95,6 @@ } }, { - "ename": "4clojure", - "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13", - "sha256": "1cqab8kh4varf5hasvhkia39fa8qmmqycica7mbcvp33n8w3941j", - "fetcher": "github", - "repo": "emacsorphanage/4clojure", - "unstable": { - "version": [ - 20210102, - 459 - ], - "deps": [ - "request" - ], - "commit": "6f494d3905284ccdd57aae3d8ac16fc7ab431596", - "sha256": "19mbfh504mli8mnf95xaych45nqnayrspymf5r80dky4jv43zzv8" - } - }, - { "ename": "750words", "commit": "bee7108d3b0f4861ec23ab7a87ddd5fbf17952c7", "sha256": "0j63ry8x617xdrffiwkwdngp6y3rik0nq2w61yf6sa097fmzpl2p", @@ -1048,21 +1030,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230529, - 1404 + 20240222, + 320 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -1070,8 +1052,8 @@ "auto-complete", "yasnippet" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -1082,8 +1064,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240222, - 320 + 20240325, + 700 ], "deps": [ "dash", @@ -1093,13 +1075,13 @@ "s", "xcscope" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "f9a6ad0f3715d7f491bbe2ae7e762a02ed12a2e0", + "sha256": "0qhzh2giaqdz6rqvhzgdv85x6ivcxwzhkx0lw5rfx0glvp48svcx" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -1110,8 +1092,8 @@ "s", "xcscope" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -1696,16 +1678,16 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20240223, - 803 + 20240313, + 754 ], "deps": [ "cl-lib", "json", "request" ], - "commit": "0189963cb60a0efdbb1cfd17641c06d16a74a974", - "sha256": "0k7ksh1d7cx5x64fbjakhxz3ab35m33sxf1dzmgymvw0xzdp9hs8" + "commit": "19aed6ca81a3b1e549f47867c924d180d8536791", + "sha256": "0nbpi5wxpzajdn85gl5zrv9blxd37jszrnn2r8j4y3xqxsx9d68m" }, "stable": { "version": [ @@ -1730,11 +1712,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240205, - 38 + 20240324, + 2139 ], - "commit": "f8df38fce4dba715f5e2252b047f9174e82f9cac", - "sha256": "0wyczjsszsn9yvchp5lihh1a7z3ax59syq1ckqg806nj1hvkfz31" + "commit": "fe84f62ea68c919bf321ba7b57b059d8d4b2bcd3", + "sha256": "12ckhv25an2f5k8w1fsfad7vqlwfi9mzdg30s48dwz4bdll5d065" } }, { @@ -1829,11 +1811,11 @@ "repo": "thierryvolpiatto/addressbook-bookmark", "unstable": { "version": [ - 20230602, - 1034 + 20240304, + 602 ], - "commit": "f4b839b20c16c53e609705506cad1ef68bff4378", - "sha256": "0n3yzxa8yxsz0q17kdcybkw9kdjnzl394gk9bq1vf0gq0hc8my7m" + "commit": "2e76708a3dc73953c1e0f66e26918690b79424d0", + "sha256": "14lvbhaqzg7jhranrpin3xzsxs1w4i6bv2bmkf9pmwyfsw5187lw" }, "stable": { "version": [ @@ -1969,6 +1951,30 @@ } }, { + "ename": "afterglow", + "commit": "aa1b650ac44ed4714959c063825617265e2a5167", + "sha256": "14148pykdw24ldpjwhb7rbc34nkvssaxqhjhs8jl4hwi1jzxm173", + "fetcher": "github", + "repo": "ernstvanderlinden/emacs-afterglow", + "unstable": { + "version": [ + 20240312, + 953 + ], + "commit": "d90fcf4e5c8ac6f5bae2eb01dea32558b2b18fba", + "sha256": "1s41v21jf2hw4n8d9frs0i5h5q0c3v1wfpwd53ghcw8inrkjcyww" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "8254dc5d4fdfec63e1b5b2d59af0771d2c5a5474", + "sha256": "1l6s7bw9cxngxh2z754yy4fnj1v7s4i95g3cyprrk9w45l20ff0f" + } + }, + { "ename": "afternoon-theme", "commit": "a5676fa2b3228cb56e38449c4573afdc37f3994b", "sha256": "0lb7qia4fqdz9jbklx4jiy4820dmblmbg7qpnww0pkqrc0nychh3", @@ -2322,15 +2328,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20230216, - 857 + 20240309, + 650 ], "deps": [ "flycheck", "s" ], - "commit": "723cf8e8d7e00c1498935553c46f459aa1d26135", - "sha256": "0634gsbbf6fwsh44lk6nblksl402yvy2cf9pcjvlbhrz7mkp2m8j" + "commit": "df6c82f1a37a4bd6f18cb463c3f7ab7d087b91ab", + "sha256": "13fy6x7cs74zpqzix719jly01v5mzdwqhcq3m3kqrsxy1m9a0g49" }, "stable": { "version": [ @@ -3399,11 +3405,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20231102, - 1334 + 20240320, + 1350 ], - "commit": "dfe0d7c9905ac31716a35b37766ed6166c1f18d9", - "sha256": "0b7r62hd2lb640xvmcj6yg4kmaa0ndknbj61pjr4jkarb8v0p8k6" + "commit": "9d88cc7ffed6f79f81a83a914554e264e35a575c", + "sha256": "116gcg09nrxpbvgv3h1hmgy2y12xl57rgy6ki0ayw6li7zn7df4j" }, "stable": { "version": [ @@ -3449,10 +3455,10 @@ 2, 6, 4, - 1 + 3 ], - "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", - "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" + "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", + "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" } }, { @@ -3803,11 +3809,11 @@ "repo": "wanderlust/apel", "unstable": { "version": [ - 20220720, - 1308 + 20221214, + 1337 ], - "commit": "82eb2325bd149dc57b43a9ce9402c6c6183e4052", - "sha256": "0qiw19pn1cs8y571irw7bjdygkvwan9ch2i1dg139dri4b6q1il6" + "commit": "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb", + "sha256": "03yjg14rvcxn59wga4jvx28ii16bx5ym93fzfyssm67gqwgyb2gf" } }, { @@ -3818,19 +3824,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240209, - 156 + 20240323, + 216 ], - "commit": "c07e90793c839d1973a0820d24e03a0a6b30b77e", - "sha256": "16jqm67yi776akshbyvflfdsis4c6zl18rmcza1s11wvfnd7z609" + "commit": "3e89e62922d610a3429707710d6636244a3c3f76", + "sha256": "1g711i4xims1mdh59cr0plfif17c9j9crgd7vv777xh19qff5imd" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "731edd2954ae213548ec4459c7db6d5db9e251b8", - "sha256": "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6" + "commit": "7ba74c7cc28e4f0da4006968ecb8587133daa142", + "sha256": "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb" } }, { @@ -3886,6 +3892,21 @@ } }, { + "ename": "app-monochrome-themes", + "commit": "54c81724187491b6f285448720f61eea7eb4ed93", + "sha256": "04bzzni91gyrdp47w2rhr9h4mdr05fihx6x12nvygjzy7dz9ls9d", + "fetcher": "github", + "repo": "Greybeard-Entertainment/app-monochrome", + "unstable": { + "version": [ + 20240303, + 1628 + ], + "commit": "84de8c0424cd51feaf758cc636d9864e7311864c", + "sha256": "0m7ka3zwfka5d484j5v6f96jr5n8rs4qbb8vvw5r2nhky9ji4cna" + } + }, + { "ename": "apparmor-mode", "commit": "6dece118970184e7fc2cfd3e26f97f2028d7f5f2", "sha256": "1ilp4srliacwgvzkbkky6ka0p60ni6v4na270iniklmjglbbs5f0", @@ -4383,14 +4404,14 @@ "repo": "phillord/assess", "unstable": { "version": [ - 20231120, - 1701 + 20240303, + 1454 ], "deps": [ "m-buffer" ], - "commit": "2399936d5b75094ed0e131b3f9d48041005383e2", - "sha256": "1a1c6f4d8mbygrl20kxlvrjcgvvbzv4zr7hhqkzywvnazf2kvj16" + "commit": "cadeb24a5d8261fad4bdfdc09e7d571cc395a6ca", + "sha256": "1vnqi3czhi0dp60rrdskyzakj3kvb7bacv9l5w8488l45wszr17d" }, "stable": { "version": [ @@ -4469,11 +4490,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20240108, - 1526 + 20240323, + 1912 ], - "commit": "d040f72cb0be5265d50ac541ddb09ebbc68b7908", - "sha256": "10lvsnvvs56l8n5f40hmqk7nwpf7d39az82mf2q7phpph7icgry2" + "commit": "72b70b004505db2f06318fefd6b358704b9167d7", + "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr" }, "stable": { "version": [ @@ -4577,11 +4598,11 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20240219, - 1742 + 20240324, + 2057 ], - "commit": "8bc72f51c52c108ece0655625dedc10b9fe1cb8d", - "sha256": "05cyjjkwl9s3sqg9a3h9xcxhp4r30d5srz93knkwi48namb1nncg" + "commit": "22d299cd0ba0c8d407acba6cb22ed8f7be4161a6", + "sha256": "15nil21m02h864vqpmnwpdd2p5zsihx86lrkvqil1zvziwykxx2x" }, "stable": { "version": [ @@ -5105,20 +5126,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240101, - 2210 + 20240321, + 2014 ], - "commit": "c4a267daf97dfc42472ea7e99fae3d7dbb6ac812", - "sha256": "0hvhvx48vhdpkzlj79l02ingshha4h1dkfxx5a2sl9gndybyfgxq" + "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", + "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" }, "stable": { "version": [ - 1, - 8, - 2 + 2, + 0, + 0 ], - "commit": "113db4d7f546b2829fed23e2c9bcb4fdac63ff57", - "sha256": "1wq8kl6659yyx8gb6m95mrrqh9bjpx4y7c6injvsqil3jkaff9xv" + "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", + "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" } }, { @@ -5129,15 +5150,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20240101, - 831 + 20240320, + 1734 ], "deps": [ "cl-lib", "popup" ], - "commit": "2afcea4bb7ba4e9573a7ad888dc6ab7bca5f7b03", - "sha256": "1i4nh340xx5waspgp5k5rcmjfcm55n2fjj6i6bxfidz7yj9sxmda" + "commit": "0c2f5a7d28b70bfe30b87378d58d74798a62741d", + "sha256": "0i70m57isahd9f1pigrx1qdl56cakjnkzyb28449pz9i31gs9sg5" }, "stable": { "version": [ @@ -5420,11 +5441,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20240212, - 1446 + 20240322, + 44 ], - "commit": "39f104ee67d6561bd8a9649f0f09dcc60db25627", - "sha256": "02ppd0zmw2lsjixq158kq55a1d3jvaya6amf1m7yglbsn48bxd9r" + "commit": "066f9723001647bec88b051e543b82366c9b7a42", + "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n" } }, { @@ -6455,15 +6476,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240101, - 2210 + 20240306, + 1822 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f9e55c75bee689722d63875610511e8b39151fb1", - "sha256": "1mw2mfr95aaz1mnq1zym9mr9n96350l4kpywg1yv2m0rvkblqqkf" + "commit": "1bbfc53a92fbae5a2b4afa34584a008dc9337c3e", + "sha256": "0hlkj2478s2j49bkmr4fg8za6frchqw8f3f5496gsy4kzdv3n9qk" }, "stable": { "version": [ @@ -6712,19 +6733,19 @@ "repo": "fledermaus/totp.el", "unstable": { "version": [ - 20240203, - 1945 + 20240227, + 1821 ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" } }, { @@ -7309,19 +7330,19 @@ "repo": "dholm/benchmark-init-el", "unstable": { "version": [ - 20240221, - 701 + 20240320, + 1342 ], - "commit": "80ba80eb62c9449b3920164d999d41b1dd7230eb", - "sha256": "0m43wsxldsv0xgliq8vgfc83yvrf19m9azw5f9s3b0mscb6ip79i" + "commit": "2b34432d79fa0aae8abc3db72db1cb79a28c00b2", + "sha256": "1slw10mp9lkfy04qgv7ly76rww2rs3yijq6sjx4jwswd4b46bmsg" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "02435560415bbadbcf5051fb7042880549170e7e", - "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" + "commit": "2b34432d79fa0aae8abc3db72db1cb79a28c00b2", + "sha256": "1slw10mp9lkfy04qgv7ly76rww2rs3yijq6sjx4jwswd4b46bmsg" } }, { @@ -7950,11 +7971,11 @@ "repo": "justbur/emacs-bind-map", "unstable": { "version": [ - 20220108, - 228 + 20240308, + 2050 ], - "commit": "510a24138d8de3b8df0783f1ac493a551fc9bd74", - "sha256": "0crxjy1ykgb429z8ikjv5iy8vg5i0qn8n86p2lgri4glx45sxxx0" + "commit": "d7b0e42b78f708669ec368ebbd1f503094ceee22", + "sha256": "0g449iyndsdmhpk4j8zrl9smkjww3vhrvv2v4d6108q1wcg1p7v7" }, "stable": { "version": [ @@ -8052,8 +8073,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20240128, - 1235 + 20240311, + 2154 ], "deps": [ "compat", @@ -8061,8 +8082,8 @@ "request", "transient" ], - "commit": "bc4f229c74c725a4981b4a5eab21674ac5097116", - "sha256": "0gd6wm97qhlrm8xxa1phc4484j7lwk1biry2h7hnkn4i0yyb04mz" + "commit": "d393ddbb70f1f27632c7ec63fe96e0179b708714", + "sha256": "10r85yjiqd656alhi41n7ykyswj51g2sanacnkfsmdaj97rv9zy4" } }, { @@ -8291,15 +8312,15 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20240130, - 1629 + 20240320, + 2028 ], "deps": [ "async", "posframe" ], - "commit": "f79a7422e5976eb3bee1c73bfcb33d701cc932a6", - "sha256": "14dvg15p18mpkp667jy0515py9alxfpjxv03y1d4p87firm9fffx" + "commit": "ab7d19c2ee54424d3ffc853982fe875ad47b6e7f", + "sha256": "127rnzwf64br0p2i3mjkzfdcjhpwn873ln1gcbhanls6sgka2ahl" }, "stable": { "version": [ @@ -8854,16 +8875,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20240109, - 1943 + 20240314, + 920 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "ef9650bb73ce901ad0fa3aef4685393a31aaa3d9", - "sha256": "12397nvbmzfnzw11dnv8xf1mapi1z9a6j9iapbx363cprsbina2b" + "commit": "9e006726be9ac508e0bb0393393abce06f7493f4", + "sha256": "0n11869w4806lak36x54rfwsnckrv7ydp3lzmdbjcq48mcsh1jjg" }, "stable": { "version": [ @@ -8887,15 +8908,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20240205, - 1834 + 20240320, + 2244 ], "deps": [ "epkg", "magit" ], - "commit": "94b9be770dd325ca5e6502822fd2f6efab220f63", - "sha256": "1m1n07m301imancmc3xcxcr6w10ixvg5m3smaa8ryw702nsnqssj" + "commit": "96ea859c8da74f415b76ccc8dd63b27ce0b6b267", + "sha256": "0gpjc7cz6hrpnq4va3klgy313s26hhibl7rfpwy4iscmslzhgdw1" }, "stable": { "version": [ @@ -9119,11 +9140,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240213, - 1406 + 20240324, + 900 ], - "commit": "5d857b56733ede08b06448f2392045bb1d89cbc6", - "sha256": "0fi3v35k56qyb8xakdnpfiphgll0f9xgzpyvxg121493rki6n5x4" + "commit": "1cc2ed75572d0dad693914e33ec5c440f7bff536", + "sha256": "0jfhnib7yziy1qqiyyjd17vcp8rbf5ha21wvcqayknhkrhxc4b97" } }, { @@ -9180,6 +9201,21 @@ } }, { + "ename": "bril-mode", + "commit": "51af2cb24ff7464024b3a5ea0192c26b4bdd09af", + "sha256": "0qgbpcvqaxr1b1lkl0xy31pdpsz60gpvvhyfrw2jcwlgk7zp1kna", + "fetcher": "github", + "repo": "nverno/bril-mode", + "unstable": { + "version": [ + 20240315, + 1157 + ], + "commit": "da61316385e31973c462a1e8a3213327b34df3ff", + "sha256": "0799x37yksd0a2zdi7x5x3i8gy02fbabyjmajbnxi32zdav76w6d" + } + }, + { "ename": "broadcast", "commit": "6ed51896112e702a8b853059884aad50d37738c2", "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib", @@ -9440,14 +9476,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20231028, - 1617 + 20240323, + 727 ], "deps": [ "compat" ], - "commit": "8ba30f5b7df3a219e792377b1d7163a536896a4b", - "sha256": "0ai2n443l3rp3pc40ppxsaldbsbqqx6822h4kk7zj6f84f9nf7cp" + "commit": "3814bdf3585ffffea3014b1d01549894ec1aa897", + "sha256": "1rqr8y3kclds087y09r2l4mrk6x8mm7p84fg2wf2kdvbqmdv7sf0" } }, { @@ -9711,8 +9747,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20240216, - 805 + 20240312, + 552 ], "deps": [ "burly", @@ -9722,8 +9758,8 @@ "map", "pretty-hydra" ], - "commit": "d686f6a303ed250da2ee01d82afea26058a0a533", - "sha256": "0842w4h4v0gkmn6mlgrp9qywqyks4k5ibz0frwqiq6dxsy0wz7x9" + "commit": "ef3b28bbdcb1e813a1d5b06a91d09774998967c5", + "sha256": "0dl1ji045g8nd8739q28csvjrxwmaq9l7vxlsw1nk1hc7apbv1bx" }, "stable": { "version": [ @@ -10090,19 +10126,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20231208, - 2346 + 20240320, + 2109 ], - "commit": "f2f7f81a83a1092f05c515f8f5212a5a82f180ff", - "sha256": "0467dmh8idcwm5qs70igls9wy6kx2kzcqig6yavcm47wjr3a373q" + "commit": "be25a149fcec1a33d1dfbdf42b265a9f0a958ef5", + "sha256": "160ijybvs2msilbh2yfm13hm3gxzkr9if9h7qqw62jsnk2nfb7h2" }, "stable": { "version": [ 1, - 33 + 34 ], - "commit": "e4fb7cd560d27d8879a2c7739ee96946adec2df8", - "sha256": "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h" + "commit": "c0764a764cf088dcb5132c44d5864b22d7723765", + "sha256": "07bsbzqxsb6sbayriymy54bqcy7is7c61fpnm83mg9527w0w4g19" } }, { @@ -10799,25 +10835,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240214, - 1139 + 20240315, + 542 ], "deps": [ "compat" ], - "commit": "c56cd95f6df003f8928f11e8776d3a9a3eca6890", - "sha256": "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz" + "commit": "a397a0c92de38277b7f835fa999fac400a764908", + "sha256": "1mixvpmb2njxziv8mbg6hrczzlvdzrn9zz01cswjywb8bl35l87h" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "c56cd95f6df003f8928f11e8776d3a9a3eca6890", - "sha256": "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz" + "commit": "af61a4e670818f100beb6ef582449931b3965b10", + "sha256": "1ml3w9xvcxbcbsi01rdsclsxra5h7jrm9lsrkbj1hin2wl5gr9np" } }, { @@ -11160,6 +11196,30 @@ } }, { + "ename": "casual", + "commit": "dcc5db335679fde21244f2c4f102acdc425e6258", + "sha256": "0q7s11ynk6bxzj5lljrc5z3v4jf7n10fi5b1jx7bc3qdg7173z3p", + "fetcher": "github", + "repo": "kickingvegas/casual", + "unstable": { + "version": [ + 20240317, + 2027 + ], + "commit": "643af803258fd9524582fc1d56472ea44c70100f", + "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "commit": "643af803258fd9524582fc1d56472ea44c70100f", + "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + } + }, + { "ename": "catmacs", "commit": "e62e45ea234a574ed602f27c3c6bc240bcd4fa43", "sha256": "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50", @@ -11289,20 +11349,20 @@ "repo": "kickingvegas/cc-isearch-menu", "unstable": { "version": [ - 20240221, - 742 + 20240320, + 532 ], - "commit": "9cf6d98b228df378e4fd428a6978c154011d130f", - "sha256": "0ca89b8z0y40b888f07rm6zmj6229mvbvwx31ffs6grpsdqn428s" + "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", + "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" }, "stable": { "version": [ 1, - 0, - 3 + 3, + 1 ], - "commit": "9cf6d98b228df378e4fd428a6978c154011d130f", - "sha256": "0ca89b8z0y40b888f07rm6zmj6229mvbvwx31ffs6grpsdqn428s" + "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", + "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" } }, { @@ -11619,10 +11679,10 @@ "version": [ 0, 0, - 4 + 5 ], - "commit": "ebb546221eed36616669ea4e42d35aa8b167202c", - "sha256": "1mkms3ykkp2lzmm2j8ain6db93yha62vk6vs2ngl1a6xdcr9xvdl" + "commit": "70b5275f0e7b8e15a3def48281f364a32c55afce", + "sha256": "0f8yl9az24bhw3w5maq68qn9gz4y4vpvf3xsngsai358vs69ibr1" } }, { @@ -11728,7 +11788,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240218, + 20240324, 904 ], "deps": [ @@ -11736,8 +11796,8 @@ "s", "yaml-mode" ], - "commit": "cd987267b379782fd623d23fca0fdae748166b35", - "sha256": "13g6b21mnpz2g4n6v9yv8asw1yhdxynqsyqhmmzfcvj9dbx6gn7n" + "commit": "9431e2261b74a5e5a4bc3d243b0e3433aec45e74", + "sha256": "0ziwx73zwshazkp63lzyhfsdfdsavmzas4ngsrd4rv4mpj41w68c" }, "stable": { "version": [ @@ -11998,14 +12058,33 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240220, - 1129 + 20240306, + 857 ], "deps": [ "shell-maker" ], - "commit": "ca5a91fe803663a4849b1ccfe1a2be91409cb43d", - "sha256": "1frav21936dd8fc3k0pcwzq0njarpr8g0p5cag8cy0k87kipxd9q" + "commit": "bf2d12ed2ed60c498d95215fa1cf81c2b23191a7", + "sha256": "0jv0zxmfv59h2cljk55syvl7rgpfy6zfydzm9bms2wyj68rv24pr" + } + }, + { + "ename": "chatu", + "commit": "b2e384b97c95f44dc8ec506ebb5955b549905c49", + "sha256": "15hckifkxm479rxcvwrrr8rky4ija6xsg9k8xkqvp3sbyg468v5y", + "fetcher": "github", + "repo": "kimim/chatu", + "unstable": { + "version": [ + 20240308, + 1129 + ], + "deps": [ + "org", + "plantuml-mode" + ], + "commit": "63a42219b28b2011e86ae5e8abb1366b65a25347", + "sha256": "0r0r3899yqy946sa2d3xfi565jh85yh9wcz9wylvrkar4rb70b6b" } }, { @@ -12637,8 +12716,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240220, - 720 + 20240310, + 1926 ], "deps": [ "clojure-mode", @@ -12649,8 +12728,8 @@ "spinner", "transient" ], - "commit": "1aad1ce6f0645c2efb35b5d0115b804415b2a2cf", - "sha256": "0f8zzvx5k09vjapkz48b93v6fg8bz66kybxk3jnvplpy3mmzlbxw" + "commit": "c4fa1a84a3b3d03ef5f61cc5d33ff4e91b9a1dce", + "sha256": "1mm4i7fjpdhqpjknziccpwm0kndb9c4dkmj52ff69dffm4zqps17" }, "stable": { "version": [ @@ -12871,25 +12950,25 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20231119, - 1420 + 20240227, + 2116 ], "deps": [ "cl-lib" ], - "commit": "d374042741cfd0691135f215d311dca8b7a47d19", - "sha256": "0509nskxf2a4msidqq18pymn0szpxmn05dfmrp7x4lwarjgr4f37" + "commit": "7044e07ab235ae09498c430558449750ec1e6a9f", + "sha256": "103ljkymlkr50w937mc2yjj0xdq8i2p7xl25xv4r74fignd29m55" }, "stable": { "version": [ 2, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" } }, { @@ -12983,16 +13062,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240208, - 1246 + 20240228, + 807 ], "deps": [ "citar", "dash", "denote" ], - "commit": "5291f504902d403ef3f39dbc5b3e1cd1c9fe4d34", - "sha256": "1hn7jhvdfac8hxmvr97lilql6lpd3akx2hklwxarp7m4awm9b9fr" + "commit": "43ecacd818f0b569b949d160bd86bff5bbe4b0f7", + "sha256": "143inb9i1xccnzj83qg2rczfizhqwshkhsa0rh3wi99hvxjigkif" }, "stable": { "version": [ @@ -13080,8 +13159,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20231230, - 1309 + 20240307, + 1412 ], "deps": [ "compat", @@ -13093,8 +13172,8 @@ "s", "string-inflection" ], - "commit": "c61c98b9d230ea28b2ca49498134803e1f8ea526", - "sha256": "04h6mgfyhx8zkjbcfhaac88754w61592pjdj27ayxh0xj0gybxzz" + "commit": "cb2d3e72116e626133703aa9875d680442249abe", + "sha256": "1jlyxq0hk6wrprpjlq8cgs14hzl8lxgdkyfl1c9lnwcr3c7iijrd" }, "stable": { "version": [ @@ -13610,8 +13689,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20240116, - 1119 + 20240310, + 2054 ], "deps": [ "cider", @@ -13624,14 +13703,14 @@ "seq", "yasnippet" ], - "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", - "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" + "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", + "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" }, "stable": { "version": [ 3, - 11, - 3 + 12, + 0 ], "deps": [ "cider", @@ -13644,8 +13723,8 @@ "seq", "yasnippet" ], - "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", - "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" + "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", + "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" } }, { @@ -13939,11 +14018,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20240218, - 756 + 20240304, + 559 ], - "commit": "4836394af1459dc8d312b25b077218a900ebfe60", - "sha256": "0dy86n73qa5mzfm4mj0in2vbnyayddwa5r9r41mh9fyq2pz1wl38" + "commit": "3792e08b76aa7fdae18938e1966ea140b9817a9a", + "sha256": "12zq6026s4yq6dbx1jy9g2fxy8ia2lm8ifx4qmnrfhcbscaj841l" }, "stable": { "version": [ @@ -14055,11 +14134,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20240219, - 2005 + 20240314, + 552 ], - "commit": "f3d9e98dd018a3140efc9b8fb8a96ba829a7e644", - "sha256": "1hwjv62h3bjs0lk7pp22mc6qf186jamacvkb9f9jm906r43dbpq8" + "commit": "8afa5656955814193b3b27020faf4edf00abda88", + "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr" }, "stable": { "version": [ @@ -14307,20 +14386,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20240126, - 1513 + 20240321, + 1332 ], - "commit": "409ab01039dd3c8f5ae0df48a1ee1c356132a9bf", - "sha256": "015246558f89vsv8ai5a53nbr1cv3ia37dndqb67r3v1fbysymbi" + "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", + "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" }, "stable": { "version": [ 3, - 28, - 3 + 29, + 0 ], - "commit": "5e984bb35232116a54de7db39788cb162ca7c263", - "sha256": "1bkbszmlmzzj6xnq8xa4fqjd45zkbw4vhhmv99whzq3kmjsmnmca" + "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", + "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" } }, { @@ -14388,11 +14467,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20230412, - 132 + 20240320, + 254 ], - "commit": "5115f53366bd6118dce3673ddec5ff428534ce67", - "sha256": "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv" + "commit": "323bfd2f66ac0d9cc831cc1ff785c1ed603f5ef2", + "sha256": "0g73an139fvv4nqgky56d211781dj5hfilgmd3zvm97gnw7xv0nd" }, "stable": { "version": [ @@ -14932,11 +15011,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20240220, - 1651 + 20240226, + 1133 ], - "commit": "1e6539f3a9b17e916b10b9423e5d617e3b756698", - "sha256": "13afznznzjfirldy1qhh42p0r91vaqj7gahcqfdflb8pvzjijdbv" + "commit": "e74bb5bbf714c8ec9649d161a90708f0b9b093d6", + "sha256": "04k6sm533db7av83j08a6kz1q1i8shhxza29fz7aql4rkazyd2kb" }, "stable": { "version": [ @@ -15376,20 +15455,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240218, - 1812 + 20240311, + 1943 ], - "commit": "0c0186cca8e7e9a12a44ffe42ad7037ffa6bfac7", - "sha256": "0gdn5wbnn8sibyiakn55hz8krncdxlpgy409vvfa5w7jlijbv9cc" + "commit": "b0a522ac5bf8ba3d2f4f22e3aa846a4f82978a16", + "sha256": "11ghdfbyg8fvi79l0xvaqhpnzlnjfl3ng517pb2h37hp2cyy8b5i" }, "stable": { "version": [ 0, 10, - 1 + 2 ], - "commit": "d832d886d0dce655b44de8c5e1eec749b2bea3a3", - "sha256": "09v0q7kxyar5r06l4lv3v78vnd39v3b0pnxg0r3h3my4ki72by8i" + "commit": "34e92d9b7084b03d087866abcd1e6a22a244c9bb", + "sha256": "1s2d0x7s8vgnc7idzcbpa3y1nrmgmpahzzzi9xh8dcsn5ss42sl1" } }, { @@ -15550,16 +15629,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20230312, - 1028 + 20240320, + 921 ], "deps": [ "company", "dash", "frame-local" ], - "commit": "b6f53e26adf948aca55c3ff6c22c21a6a6614253", - "sha256": "0shzdvzrihw8rqgliq6aj1d856m30nj4skzldmw1caqmghfqwv7m" + "commit": "c4f2e243fba03c11e46b1600b124e036f2be7691", + "sha256": "08bqg65zjpfk5raa0yd2p3v5h35yq1ksr62dx4wdznjc2zb3drk4" } }, { @@ -16493,21 +16572,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240201, - 843 + 20240222, + 320 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "38b991e1f2dcd05e7e00ed6c33b28fc877271eb3", - "sha256": "0rwz5w0djngacbxzidam7vpfgxk82c4l6lp9psw2siv5yr2yqxkx" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -16515,8 +16594,8 @@ "cl-lib", "company" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -16667,27 +16746,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231123, - 2208 + 20240226, + 204 ], "deps": [ "company", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "company", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -17328,11 +17407,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20231226, - 2123 + 20240315, + 2126 ], - "commit": "5ca966d73fbc6ec3835ed2db5be8c9ca05fc4586", - "sha256": "0p8zxb1wjd67k47g25k4hva2q6wf13214437anqhnw53kps4yfqk" + "commit": "7124939e77da2bf3847aeeba2ba0387e47e11ce7", + "sha256": "1b1dygxgd1snm6faf61vpa6kdq67ag5xc805bn8ksbvljn0d4x0i" }, "stable": { "version": [ @@ -17730,25 +17809,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240223, - 1314 + 20240323, + 2016 ], "deps": [ "compat" ], - "commit": "66f7c20899976f23494c7016ce0cd25f1b4ff2e0", - "sha256": "1kby7wwl697xwgnzqfzclc1jxdp9wjvcjv86j6wdc2x2kxkpg4rj" + "commit": "ec232fa60497e7a3abcf6e385181afcc0cf6017f", + "sha256": "0z33j3jg4kspyqcm95yrvdw9y90a8ikjz8n5ycfyrjydpa838c3r" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "66f7c20899976f23494c7016ce0cd25f1b4ff2e0", - "sha256": "1kby7wwl697xwgnzqfzclc1jxdp9wjvcjv86j6wdc2x2kxkpg4rj" + "commit": "0eab65fe3273c97a422c99ee426eef7f2d2dffa4", + "sha256": "0kp1xrivs111d8ksjyf3m1ldzb8qknwrh2k2lzbrq6yiwc4bigy7" } }, { @@ -17917,7 +17996,7 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20231209, + 20240324, 1137 ], "deps": [ @@ -17925,8 +18004,8 @@ "eglot", "project" ], - "commit": "049c6319b8a48ff66189d49592c7759f0b356596", - "sha256": "0q2c7nw88cp63wp5vn8b4n6799ibd76hb472g0mjnrk374h03pai" + "commit": "4fa151f83f15de22eb2a241ddce95bed80b8ba79", + "sha256": "1bri48z9yarys95w77mxmbn6nj7wypb23bjmz410p885ma98wn1x" }, "stable": { "version": [ @@ -17944,6 +18023,25 @@ } }, { + "ename": "consult-eglot-embark", + "commit": "5ffb32a540ebf6ebffd1913de1d82019674177fe", + "sha256": "1avmvd2rz6py9m089id9adi5ympic1cz0pp0xwh2kbbhyij30ns4", + "fetcher": "github", + "repo": "mohkale/consult-eglot", + "unstable": { + "version": [ + 20240324, + 1211 + ], + "deps": [ + "consult-eglot", + "embark-consult" + ], + "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d", + "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh" + } + }, + { "ename": "consult-flycheck", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", "sha256": "12zwy7jwbg7njm009c1rns0q382rv5lmbzjb4giy4wwwpjg3nfgf", @@ -17951,15 +18049,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20240102, - 330 + 20240310, + 1442 ], "deps": [ "consult", "flycheck" ], - "commit": "d83f87581af74f7a2739d8b1b90c37da5ae3d310", - "sha256": "1j1kh6imhryr973i42q41h5jwxclzx5mxvy21ac84pihvvspf71z" + "commit": "754f5497d827f7d58009256a21af614cc44378a3", + "sha256": "19smn8wyindw92nvfskg5s889pdc5hn0w9q5z13hmjb8iv2gx9yp" }, "stable": { "version": [ @@ -18131,16 +18229,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240216, - 311 + 20240306, + 1529 ], "deps": [ "consult", "dash", "s" ], - "commit": "d6e340044cd1d263f51b7c1877e04566db485f34", - "sha256": "1j8rckv9ksizvzznbi2v6hg1jcy9dp02jjzz3pbrpy5mx7n830d9" + "commit": "652d0281b81becac643efe96386facf23e1dee01", + "sha256": "0ka4mr4gg2nmkg0fr7i9dq3f3jmq9m16wbzjk5w9x5yxhh9rymx2" } }, { @@ -18300,26 +18398,26 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20240130, - 1536 + 20240307, + 1019 ], "deps": [ "consult" ], - "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", - "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" + "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", + "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 0 ], "deps": [ "consult" ], - "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", - "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" + "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", + "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" } }, { @@ -18362,15 +18460,15 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20220724, - 1338 + 20240314, + 1838 ], "deps": [ "consult", "yasnippet" ], - "commit": "ae0450889484f23dc4ec37518852a2c61b89f184", - "sha256": "13hmmsnmh32vafws61sckzzy354rq0nslqpyzhw97iwvn0fpsa35" + "commit": "834d39acfe8a7d2c304afbe4d649b9372118c756", + "sha256": "0vjsqjhgzxvdhhcis5gx8xc56mjl3drpy1qn1265f6474j7y4frv" } }, { @@ -18686,14 +18784,14 @@ "url": "https://code.bsdgeek.org/adam/corfu-candidate-overlay", "unstable": { "version": [ - 20230814, - 1537 + 20240322, + 1814 ], "deps": [ "corfu" ], - "commit": "265438b16155e899d82a869aebca16105665c998", - "sha256": "0i36g2i7435pby32vcapv4ydmp6rqn0r51qm91wqyzan1f3n3qck" + "commit": "f730de2c150720ee70d4d7be4b8bb533c7dfc97e", + "sha256": "17qrk02las8laxkf864zn8fkamihysi9bfjzil998kdmxhvrfxsx" }, "stable": { "version": [ @@ -18715,27 +18813,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240106, - 2017 + 20240226, + 204 ], "deps": [ "corfu", "prescient" ], - "commit": "4b875be52e75f7b81e68a16b62cfbb2f2584042c", - "sha256": "1ks7adpyzils4n4clyds7cncbcd0g41ymisyi1jqb0wn9r82i93h" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "corfu", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -18815,15 +18913,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240214, - 2118 + 20240229, + 1509 ], "deps": [ "ivy", "swiper" ], - "commit": "749ac1235a7948011cb0caddd4c31037e3314614", - "sha256": "0d598jxdrxjlszaikh27v7j2zdndisfqzb384d94siw4rwzfj4zr" + "commit": "14c696aa2d6cd905795ba543374457a04a13ccae", + "sha256": "1j2x1jqyhkldkm1fcm6ycad92dc3jkxbr44hqw3kiq6ghbz746da" }, "stable": { "version": [ @@ -19936,23 +20034,20 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20240223, - 1420 + 20240229, + 957 ], - "commit": "a8dbf91e88638aa76f6dcbbdd8621f2ff5673765", - "sha256": "1hmny162l2yakhlc76lvk71lqz7invkxfw8v69x31zng16pwdx67" + "commit": "7980df10e47eef41d4d1c57cfb690ec406381ed3", + "sha256": "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "deps": [ - "seq" - ], - "commit": "3445e7e027592c50505c5237ed1484715d2a3892", - "sha256": "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj" + "commit": "7980df10e47eef41d4d1c57cfb690ec406381ed3", + "sha256": "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy" } }, { @@ -21501,11 +21596,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240222, - 59 + 20240322, + 340 ], - "commit": "ed1a6a452e26e2042faec2e073f1441d73a69447", - "sha256": "15hnp1xwwq8mssdz5vi64v80cgv1zziinm11y3pmrhrxmlzm4321" + "commit": "05b4b1a7bc5ec5d0fca5ee6cd6a2099107c47b15", + "sha256": "0hscfmm0rz6rz3npb0kgdwv836s9xlp0j61nahjqgwq9lqkmjl0a" }, "stable": { "version": [ @@ -22321,11 +22416,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20210707, - 1633 + 20240309, + 2117 ], - "commit": "28be94d89bff2e1c7edef7244d7c5ba0636b1296", - "sha256": "074d8apvfp9na14q080w14i9ixbswvp7akjyv8gmxmy5im4gm0y3" + "commit": "bb1a16b87c3e0fe70fade6227e47dd7712b89bf6", + "sha256": "0mmhqk7bh34l1zb4hskd914qs28vi688jvhlcdrgdl62s3184m8l" }, "stable": { "version": [ @@ -22445,9 +22540,9 @@ }, { "ename": "deno-ts-mode", - "commit": "0a5c849697a2a277f8c07f8cf0a6a3a92dd18586", - "sha256": "0dkcnz0r8mgbyd4pfa3knq1qzzlgmz3iacmdj1s0m7p24ki6yvh6", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "0jrjdryfk2smylm4z8v8zxgrzdqq6m7ybg4bcskjwr7vk3smndmw", + "fetcher": "github", "repo": "mgmarlow/deno-ts-mode", "unstable": { "version": [ @@ -22475,15 +22570,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240212, - 716 + 20240317, + 919 ], "deps": [ "dash", "denote" ], - "commit": "f1dbb2d93919f7efc0e6067f794b229ef7659d1d", - "sha256": "0c891zivwfpfazy9zmvj42gcr9bignbky636xmngf4l7i1p9qcig" + "commit": "53dcead5eea35ec0545aa85e8f0c8384b6f4eb57", + "sha256": "1wdsfyc2qzvhaj3dyfxg045sr9naqrg3yip4fwj71rfzzkpva3j0" } }, { @@ -22704,11 +22799,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20231127, - 1905 + 20240323, + 823 ], - "commit": "f0436bc0e2077683438e838acdfc425337898175", - "sha256": "04f7idkpbjkyrcaklh5fmchi9s4inixibrikkrrfjyrc85l2j31d" + "commit": "01ce2c06e997cb821be6123395fb6d224bf958ab", + "sha256": "14rp8f182bfip3p00khinp9rnr7nr2l86r6ppqyd37idk1mf158w" } }, { @@ -22920,11 +23015,11 @@ "repo": "kisaragi-hiu/didyoumean.el", "unstable": { "version": [ - 20200905, - 1843 + 20240229, + 1807 ], - "commit": "ce5edcce160b86e7f6480f0381be785d43f97e19", - "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" + "commit": "fc12bd33c7b4f6dc74e49735c269ff75c72227a1", + "sha256": "1fc0bmhvhmhnvqsp5j3dwhsi355aarrxcs5jgnjp7y26wi6ijn4h" }, "stable": { "version": [ @@ -22974,14 +23069,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240127, - 34 + 20240225, + 116 ], "deps": [ "cl-lib" ], - "commit": "b8b2727a72fdf64ac98e6cfa136a43cb0cacf72f", - "sha256": "0g0gq8n5968qxbqb965kq4crm18n3k6miiiv90pdygykq1b2gww5" + "commit": "96620839430c1205cbb8c92dd54973397f70f9d2", + "sha256": "09i735cd8pyfdk5llk47liywc0l3irh4ipwqky9vpp3mh3xg1f4x" }, "stable": { "version": [ @@ -23097,15 +23192,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240223, - 1630 + 20240308, + 1548 ], "deps": [ "compat", "magit" ], - "commit": "029baa91145f72ffa95b23fab86c6598de654cfc", - "sha256": "0lsf0bi7k1pf9kx9lrb1r1vdplr3a4ij2is46y08zm04dzqpqa1v" + "commit": "763e5f25925a8a625a943953a5f13d21b9a3bc51", + "sha256": "0v9w6iswshr8mj1g5bp9i13ck0wd1jcy4czancgwhc8hn2k5dnnl" } }, { @@ -23526,6 +23621,24 @@ } }, { + "ename": "dired-auto-readme", + "commit": "d5942df9855b69f93ca64f82c653552a7b76a521", + "sha256": "1gxngps4xa90hkxilzz694w4qdhiii170lrhi6z57iy18fviws75", + "fetcher": "github", + "repo": "amno1/dired-auto-readme", + "unstable": { + "version": [ + 20240318, + 953 + ], + "deps": [ + "markdown-mode" + ], + "commit": "8c31904ec8200e04e3d4efa2be2d1c935675423e", + "sha256": "0dp1b52748fdhsjma9s4np3zq83mqc6rcamxhdlawccaq0dn9ipg" + } + }, + { "ename": "dired-avfs", "commit": "568e524b7bdf91b31655bdbb30fe9481d7a0ffbf", "sha256": "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm", @@ -23552,16 +23665,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230621, - 1019 + 20240322, + 2135 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "874449d6fc98aee565e1715ec18acec3c1c2cafb", - "sha256": "119m942a9p13l62w5wq2iprkvakv0c4xwfhq2yivhwb21rqmxq0g" + "commit": "c3bf65aeacfc5ae04508ebcff7b0c9fb37ca4beb", + "sha256": "0slv5v4d5iqx02ilcrp30i6jhismvw5n123m7p0fbmqpb7pv2070" } }, { @@ -23794,6 +23907,29 @@ } }, { + "ename": "dired-hist", + "commit": "54185115f7b74608ccd5cdf026817f4c9c17850e", + "sha256": "1hjfymdffqh0vi748c5bl5sbp0jkdwwidn6i0r0p41d2v7nhxxv0", + "fetcher": "github", + "repo": "Anoncheg1/dired-hist", + "unstable": { + "version": [ + 20240324, + 509 + ], + "commit": "1755b7bbb81e83563feac8e395e0d9fd85217ad6", + "sha256": "1h60m4w0dyhacymx2m9yrci742wk28wkb36pmq5sxvpck8jbd110" + }, + "stable": { + "version": [ + 0, + 13 + ], + "commit": "1178b678c249cafd9b320d8305798c30ff367939", + "sha256": "1xpw3h6iwy3wd34hafpzhq37bmphi0qrmcwsa9p6y7s64q3fpb1i" + } + }, + { "ename": "dired-icon", "commit": "8a96249947cba52cd75515b3dc83b0842fedf624", "sha256": "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1", @@ -23871,11 +24007,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20240123, - 611 + 20240317, + 2344 ], - "commit": "5bd3e4b8068bc5c345965f09d46709e08e15d666", - "sha256": "140z5qxvgm7dd4vl7mcmc641ma806nw6sjc0q1cmlaswyrl6793m" + "commit": "0a7dbe002306cbeeedcf5b9fbbc72adc83f0d331", + "sha256": "06p19kwh6xr5krs4j54qx342ncnlhiszkml13b51k0h2kqvchlkm" } }, { @@ -23886,15 +24022,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240318, + 845 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "475be5486bc2d593283ba6e8c8c43053d4cbdd7f", + "sha256": "1gz3wk3s42fj8qvbiyh4147ryqqapy2jp37dbs0z03acwqn9d23p" } }, { @@ -24178,14 +24314,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20230623, - 1655 + 20240320, + 1952 ], "deps": [ "dired-subtree" ], - "commit": "85ec4fffc2607d38ec2e3b8577320aceb8e652dd", - "sha256": "09708kcbzx9v904rg49yg3xjix8kbkx89xsysx66imxh3s8f8xjb" + "commit": "573658021fd6e6cf032d789de29aca4e5dd258fd", + "sha256": "0icy2mzkbcrf7dq0zlakq56h89jw0rdlgfn0z6zz0hlyq2d2zhz6" }, "stable": { "version": [ @@ -24329,14 +24465,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20240219, - 2237 + 20240314, + 753 ], "deps": [ "key-assist" ], - "commit": "91cdc351e1cf6680b838980121802b682ee2210d", - "sha256": "0bqirfvjvi37ysjyvpgnpwjw6pfpxbz9h0jxrhc1dd6cqdh40dr6" + "commit": "b638face71558cc1444c352fe6bab2d9b28bf281", + "sha256": "0askrlywbkj1x92l8hqdwb6xbcyj16gymmcima8spvjxjdbhm3y2" }, "stable": { "version": [ @@ -24404,14 +24540,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20230721, - 714 + 20240314, + 715 ], "deps": [ "dash" ], - "commit": "14f74269af34f8c30ab4a521eff290b74460daed", - "sha256": "0q5n499vc7d57fyr98alyrfycdvwgykf2fia3jq090h6xn5jbjl3" + "commit": "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f", + "sha256": "1b68rz3y64afwbh5brxa9yzwmsjg1g8irgvbvdblazhciap397c3" }, "stable": { "version": [ @@ -25413,11 +25549,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20240223, - 1357 + 20240324, + 1010 ], - "commit": "35178a080fb3b61051437570f51fa0cdf2b7772b", - "sha256": "0lz6lfyab2f9nw0fwkvvn7zx361c3wm0aar9v2vhb437c0mxzndh" + "commit": "39a012a27fcf6fb629c447d13b6974baf906714c", + "sha256": "04r8y5zhgv0nv85bw0li47r577rw7wczikx65aazvxk0skgda5sw" }, "stable": { "version": [ @@ -25537,11 +25673,11 @@ "repo": "ag91/doctest", "unstable": { "version": [ - 20240212, - 1801 + 20240321, + 2345 ], - "commit": "0a621020e671ccf75de1582b78da5a6ff31e0d69", - "sha256": "1yg2hs08kgrz4kyp5z04ldlzhpy0lqsqmx2r4if6qcxyqvm89wva" + "commit": "a1fc9f2fcb45ea980ca25c524d54a7b0bd40e3c9", + "sha256": "0im29nv6gz3gpkh9c3m03pkmj034rxsarw0qw0b1gfpl5c91nsxx" } }, { @@ -25670,16 +25806,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240221, - 817 + 20240324, + 1457 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "f67f627574e02b4a474b2dc5e8a68dbdf6cfd913", - "sha256": "13rdgb4j62d4aszwdklym17dxghvqabbdg2dv5vzf957nn0kwhkx" + "commit": "2e420e64ffadc7489e281ea69e572cd0e415fbcb", + "sha256": "00jgs4d2si2c6m7bghzlczl8vj48snyr7z68igh0lgq5afg0s81y" }, "stable": { "version": [ @@ -25723,14 +25859,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20231208, - 2011 + 20240320, + 121 ], "deps": [ "cl-lib" ], - "commit": "ff26f26ea3d761375f5fc4070438fbd0f3473d33", - "sha256": "0ag8va9xwr61ra3nn53alggmdnw42x2z7820jyjqff39f5ziqszs" + "commit": "37d2182f5078d29fb22bbace346e523bb84b2c4e", + "sha256": "0zhncai46b3rv205v8cmdvlg746gy2q4c6mq3vn3p5a3mqv7jn1r" }, "stable": { "version": [ @@ -25950,11 +26086,11 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20231220, - 35 + 20240303, + 1522 ], - "commit": "767ae6e9c2222e689272089a96f9545f1eb5552c", - "sha256": "1dhq1vdwggl8wz812v2r9ipmz35yry3ylkm851p11wizv0z91whm" + "commit": "69b294694c57d8e7571fada6a6651c40d266285e", + "sha256": "05zyjc0wcx70b1fzxhh8pwnhvmza03afqxvvbmip7hcxnyf2wajy" }, "stable": { "version": [ @@ -26257,8 +26393,8 @@ "repo": "thomp/dtk", "unstable": { "version": [ - 20230924, - 2038 + 20240317, + 2328 ], "deps": [ "cl-lib", @@ -26266,8 +26402,8 @@ "s", "seq" ], - "commit": "5d7fc18eee0d219f52585e05b303f494dc5831cd", - "sha256": "1hbzxir6b0r6cr0sl8yjabk9c7khrqwyjzd5pq90wsslgik3zg4x" + "commit": "461f30f2e2038c3c469e710309046c0af4d6b41a", + "sha256": "12v1lac0sq72aip6k29l3agxbqagcf300wdbpbx3rq65kimdnvid" } }, { @@ -26434,10 +26570,10 @@ "version": [ 3, 14, - 0 + 2 ], - "commit": "73250f00372d3f28a25963ded6138728f4202663", - "sha256": "1c97838q4lfp26z12qwhp2js036cb5l5q8yr76a8msisx22cnncz" + "commit": "b19f6df8954995899e30275055d9582b6c83687c", + "sha256": "17h91vvqdmwkl7l4b7z6mzxsq9g2czzi9h3d68csz3h0jhwwn130" } }, { @@ -26570,11 +26706,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240108, - 1754 + 20240324, + 1906 ], - "commit": "7a2c298424466d2bff7c050e01fb85b5f882dbc3", - "sha256": "0ac32n212g9jk76zns6z92syx2himhxll6qr8drvvz98ybjh46pm" + "commit": "5049375dcba5b58c35b558c9a5975c3424855ee6", + "sha256": "01m3w9cv4ckj78x111rfxcj44by3kngvlisz9gzsabi3hz2rn42d" } }, { @@ -27038,11 +27174,11 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20240223, - 921 + 20240323, + 2214 ], - "commit": "6c672569c6d6e9ad6387b3cef14beca6ba45ae85", - "sha256": "0h11iw1b16vd87hg2a6jlrqg3gmxad14mi5vkwc3vc9n4wzrivpv" + "commit": "9a98b6c21c289dec110b434899fd050778eedab9", + "sha256": "070fc2p3wcb63x3364k815yxm1f7ks5vdjdaw5p7grzn9664crn5" }, "stable": { "version": [ @@ -27089,8 +27225,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240223, - 743 + 20240316, + 327 ], "deps": [ "ansi", @@ -27099,8 +27235,8 @@ "lv", "marquee-header" ], - "commit": "f6ee724eef0a289e84a6b00a1b973e92acef4a4b", - "sha256": "0vbi892qp82s02cqb2bjfcrr5i4570mxwi2gikg5csg2pnq7gfsg" + "commit": "85fcdf4db86f8d6773ce7d309cf752c9f972e564", + "sha256": "0pczdrjlf0w7f3zdcd45cgirk6hbzm14hx0gjip7l0ypwgfmhixv" }, "stable": { "version": [ @@ -27369,28 +27505,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240205, - 1511 + 20240305, + 752 ], "deps": [ "compat", "parsebib" ], - "commit": "2c5a2c42708302c40d19c36b35422df9e8fc6c73", - "sha256": "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y" + "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", + "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" }, "stable": { "version": [ 2, 40, - 4 + 5 ], "deps": [ "compat", "parsebib" ], - "commit": "2c5a2c42708302c40d19c36b35422df9e8fc6c73", - "sha256": "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y" + "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", + "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" } }, { @@ -27401,8 +27537,8 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240203, - 1945 + 20240320, + 1935 ], "deps": [ "citeproc", @@ -27410,8 +27546,8 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "fbeaba52260f5ee7323839cbe15c4125532a9240", - "sha256": "13gc1m5ayzb1z1npfc3nvmw9md2nspzrrskqif71633rbgik7h5h" + "commit": "e38aa3fbf570ab1eef3bf0441e5be59586672377", + "sha256": "11kbbv6s4qinx0l95f7j6ic40ykfcjpmz6wsl8jx9fdqrlh9b91w" }, "stable": { "version": [ @@ -27481,11 +27617,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20231121, - 1720 + 20240307, + 741 ], - "commit": "1138151e55fdfd43126c79caf13169a644b47c00", - "sha256": "01ydg9a2b4617cqz2w3jb6dk9wkrl559qssa2z1y6gz3awy6fwd6" + "commit": "71ef563df7f1b85cfe64854b6e40bb353a281cc5", + "sha256": "1hgnmyphzww9gq6ww3x0xckn25rb26dlkbh22vf23566yhq1s993" } }, { @@ -27550,8 +27686,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20230220, - 456 + 20240315, + 2350 ], "deps": [ "ansi", @@ -27561,8 +27697,8 @@ "f", "s" ], - "commit": "6bc1feb33d44bda7a7ccf06f8748050ffa1dc23c", - "sha256": "0wcc2rygz6l496fbh6azlbphdk3qn9hfdmcnq7wrcjy35b5f0cbw" + "commit": "11225972934b3cfe09ada87dd785f8dd0082b6e3", + "sha256": "0m3p25kxqzj4mndb7bpi6ymb309zsq46102g38yq244dsd3xwqdy" }, "stable": { "version": [ @@ -27943,14 +28079,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20240129, - 257 + 20240318, + 2049 ], "deps": [ "nadvice" ], - "commit": "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1", - "sha256": "1chhc0jffk7zrll737h2wpr0ccakvgskblfvw5jsprscp00asm11" + "commit": "6b85f0475f01ff97f3233acb68e2646d2ca32a91", + "sha256": "1c78vv29sq8hk59mw7ir3wqrwz5gl9nd7gf3dgla6kdfw6ba3783" }, "stable": { "version": [ @@ -28394,15 +28530,27 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20240223, - 1709 + 20240322, + 239 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "f7b1ff5132308a110aeb8fa2364868f8e9fea557", - "sha256": "0573l48lchrrzcgy8mj7i5rj3a7jx6sjj8ixd4jd2fjmfssq86x8" + "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", + "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" + }, + "stable": { + "version": [ + 1, + 34 + ], + "deps": [ + "eglot", + "jsonrpc" + ], + "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", + "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" } }, { @@ -28413,30 +28561,30 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20230601, - 1335 + 20240318, + 1159 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "7dc604fe42a459a987853d065cd6d0f3c4cbc02a", - "sha256": "0ska1i7n2ykyxm3w64661x24ycfdn2vl7px0hv33llg2sbd9famf" + "commit": "1d9cab682380f37ca1e9e9933cda13164600706d", + "sha256": "0ynrqvshr8jzndqq17m5r8jn4lk3k5bfi8nqb6aa7hyfk7bcriy3" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "3e66d604b66a35290c686194de7cb39b113ab20a", - "sha256": "0n9cf3cpf55f4n4nmfl4m2pai1b8hznyivr0vzvf9p56iyfnx98g" + "commit": "ab5e6835ea9a16e90ad1b5f369a96a60455e855c", + "sha256": "144q4fj3am165vf1vx2ljlsmpn8vvvs1b95qi3rxlwqskkx0lig3" } }, { @@ -28659,28 +28807,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20240204, - 2244 + 20240320, + 242 ], "deps": [ "llm", "triples" ], - "commit": "7d1e426daacd5d5f1e1e8c0e9f2c71e6a557219c", - "sha256": "04iz6dy7mnl3mdnach43j5qpfzlyd1lp9np1zjw7y878qdjypalv" + "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", + "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "llm", "triples" ], - "commit": "7d1e426daacd5d5f1e1e8c0e9f2c71e6a557219c", - "sha256": "04iz6dy7mnl3mdnach43j5qpfzlyd1lp9np1zjw7y878qdjypalv" + "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", + "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" } }, { @@ -29152,11 +29300,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20230627, - 1213 + 20240305, + 2138 ], - "commit": "bb12802f1f1e34345c600f69111c1a53bf98185e", - "sha256": "1pgnnm12pd5y67lcnzwd2f4b0cc2kaxxvzxb7a4ipb2gb0vwy3if" + "commit": "e2775f40ec55dfdceea83d535dff77d60534b6bc", + "sha256": "0dw5vf6iqncs12x494z5cj7ym9daxaa9ldzbja7vgzkdyy82yvp4" } }, { @@ -29201,20 +29349,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240219, - 1855 + 20240317, + 1521 ], - "commit": "be713ddddcaa7a569494ea5d7e43c9681a2a8aea", - "sha256": "1r1g8j3ph537wir3q3syl9bh96dnb7nnfikg5hvahsv6qcjkx17f" + "commit": "76b08f798c94e2c6f107cd1fec9fb8aa02b5aa5b", + "sha256": "0gdgf2pkys4jxy7zknpixvygyhjv1xk9949frks3xlpiknvmkxdq" }, "stable": { "version": [ 1, - 8, - 2 + 9, + 1 ], - "commit": "220f54cbd2398843c91065bc3a2375fe8934dcdf", - "sha256": "108px7lnf39ngvb8rcqb9qh2amcbs1h22dbwd1q7js2np2nd132y" + "commit": "4da05948a10f1d7297ee80907e1412de76170b51", + "sha256": "1v0jwzwq0xpih8m4aymz90fdfvypkiqczh0ip5jg4kcvzikliw3f" } }, { @@ -29450,20 +29598,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20240221, - 2202 + 20240319, + 1842 ], - "commit": "af8a681966dcf6a51a33188f1483c2a68af94ff7", - "sha256": "0pp6j2anzbm3ziv6rb16h9gqiqqcym52b5lfigjr5i33v9a5xdza" + "commit": "e5283062fdf66aa2d664059b307839bf94413055", + "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" }, "stable": { "version": [ 3, 1, - 0 + 2 ], - "commit": "af8a681966dcf6a51a33188f1483c2a68af94ff7", - "sha256": "0pp6j2anzbm3ziv6rb16h9gqiqqcym52b5lfigjr5i33v9a5xdza" + "commit": "e5283062fdf66aa2d664059b307839bf94413055", + "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" } }, { @@ -29987,6 +30135,40 @@ } }, { + "ename": "elisa", + "commit": "08093b0f7196322df0a66b0ff47fb110aafcbdbb", + "sha256": "0pwfxk4knqjfqja7hwddk2b8084mn8mrjiffzsn8qwam61hwhbcb", + "fetcher": "github", + "repo": "s-kostyaev/elisa", + "unstable": { + "version": [ + 20240322, + 1808 + ], + "deps": [ + "async", + "ellama", + "llm" + ], + "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", + "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "async", + "ellama", + "llm" + ], + "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", + "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + } + }, + { "ename": "elisp-autofmt", "commit": "6d5d559e92ade81b24d313da12520896de964a46", "sha256": "1cij8nh8lldpm46v7m3pc2x2z9gkh1g26qk7in9hn3lx0nwdxavc", @@ -30308,30 +30490,28 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240223, - 2012 + 20240316, + 1610 ], "deps": [ - "dash", "llm", "spinner" ], - "commit": "5acc209c299b9540265141b466900b0c36dc0ff4", - "sha256": "15xaqjcqks6w63107r8w6329876jvj5h1zbwgx9rc40z5qq9vamg" + "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", + "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" }, "stable": { "version": [ 0, 8, - 7 + 13 ], "deps": [ - "dash", "llm", "spinner" ], - "commit": "5acc209c299b9540265141b466900b0c36dc0ff4", - "sha256": "15xaqjcqks6w63107r8w6329876jvj5h1zbwgx9rc40z5qq9vamg" + "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", + "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" } }, { @@ -30625,11 +30805,11 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20230808, - 1523 + 20240229, + 1034 ], - "commit": "dfbb68ac183b8c3e6e370c45032790ed7cf52165", - "sha256": "0lvwa14i1s9dhrpv35gqw3ra5bl006km0k2ygs8issy6vy9y3jll" + "commit": "3c77587a6ab6cdf041f969d8606407e575374022", + "sha256": "1wrv17hcyqw00n3lhsw4kncqg116hr2mq7hhx60fig1sdv09gs6q" }, "stable": { "version": [ @@ -30691,20 +30871,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20240214, - 952 + 20240324, + 1315 ], - "commit": "3f53ed5b6550d25a66bc83f6f26d8cfb06b1dcce", - "sha256": "1qiqjkbqjv6gw4lyf697jsb081sy2r46i3q6gdssfrhsjjmb8jag" + "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2", + "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s" }, "stable": { "version": [ 3, - 5, - 1 + 6, + 0 ], - "commit": "3f53ed5b6550d25a66bc83f6f26d8cfb06b1dcce", - "sha256": "1qiqjkbqjv6gw4lyf697jsb081sy2r46i3q6gdssfrhsjjmb8jag" + "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2", + "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s" } }, { @@ -31438,14 +31618,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240221, - 1649 + 20240323, + 2205 ], "deps": [ "compat" ], - "commit": "c93abadc8220c0caa6fea805f7a736c346d47e7e", - "sha256": "0pmg58anfgsp1v9dg56kbihv86k88pjicid41mzqq9jpwx4wh8x0" + "commit": "15c95aee0ec6f42ee3b7a0bc6cf1e2c1ad91dfcd", + "sha256": "1lv8r1xpilcpx061s16m9s44i79lqcw6cxggx39phj8855zp3cag" }, "stable": { "version": [ @@ -31493,6 +31673,37 @@ } }, { + "ename": "embark-org-roam", + "commit": "2e5ff49735c703637570ef0479b3b613de8cc3f1", + "sha256": "1nndgzpp4jgraf0lc9zqw7z0zqplmfq6r6r40xzz7lcq99xxs6i6", + "fetcher": "github", + "repo": "bramadams/embark-org-roam", + "unstable": { + "version": [ + 20240303, + 335 + ], + "deps": [ + "embark", + "org-roam" + ], + "commit": "5bc9efc33e74eb47becbc2f6467141864cb6ecea", + "sha256": "07k9c5bxdi3v4mb2kfkxx71dh0g44iw18m1dpydnziwhayw7sky4" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "embark", + "org-roam" + ], + "commit": "5bc9efc33e74eb47becbc2f6467141864cb6ecea", + "sha256": "07k9c5bxdi3v4mb2kfkxx71dh0g44iw18m1dpydnziwhayw7sky4" + } + }, + { "ename": "embark-vc", "commit": "69145c00a0903f876cdc2a76c2aa57defb300678", "sha256": "05pcr1znlfrls9cr76sif6wiinkd0bz2h06csv508w880h8lb1r5", @@ -31520,14 +31731,14 @@ "repo": "madnificent/ember-mode", "unstable": { "version": [ - 20200208, - 1423 + 20240301, + 1056 ], "deps": [ "cl-lib" ], - "commit": "a587c423041b2fcb065fd5b6a03b2899b764e462", - "sha256": "0x5fnrflbgafwcqr6v0jj6522j2j086s7msh2mr6yysmrfjhx2zk" + "commit": "2fd5da9e360db134232d373edf09373fa762e092", + "sha256": "0x6k1r8r1vdgf88dz8saz9d71d16cl1rqx5ij0gfi252bfwqnq8y" } }, { @@ -31645,28 +31856,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240211, - 2229 + 20240318, + 2011 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "9fec86dbb768b3b5714036d08129a20664f57657", - "sha256": "1ig6jaw1cg9pchgi864vp812pj66pp2q9crk74b3pfgi2viqg3bz" + "commit": "38417250833e14914d3cff65ebf8b51a1b9c1da5", + "sha256": "1qwpjrn8jm35ylbh7n2f3xk7z30czzx5w2nzi3qwmwrlb4wvp0df" }, "stable": { "version": [ - 18 + 19 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "174a9f1e6a67830cf24c05eb6b99ab3fb11a579e", - "sha256": "0awdjsk5ihd52qp3878w732z2infwh5h32n54gz6g23bzm0pdjn6" + "commit": "384ca4544ec359bba08d2f9d2a78acb8f9917e25", + "sha256": "06yk5fpmgqkxrpcyd8gqq9g11x0clv8zgbwvxr95nwz720j70i72" } }, { @@ -31788,6 +31999,39 @@ } }, { + "ename": "emms-player-spotify", + "commit": "e83ca8e7027f3886a6322664f2c8bcca12f1c83a", + "sha256": "1v1wpdhjsjdj19swhh2xc7l1b7ls1q197pb63xmw4633vvlij8g4", + "fetcher": "github", + "repo": "sarg/emms-spotify", + "unstable": { + "version": [ + 20240302, + 2106 + ], + "deps": [ + "compat", + "emms", + "s" + ], + "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", + "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "compat", + "emms", + "s" + ], + "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", + "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + } + }, + { "ename": "emms-soundcloud", "commit": "952c7a383d39825805127bd709fa60ac77ef724d", "sha256": "13vpcgqhhxhvgf22jpqidb9a1q4l1x9m8kfdv9ba9h009xf2a1pi", @@ -32023,15 +32267,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240210, - 2233 + 20240310, + 28 ], "deps": [ "compat", "s" ], - "commit": "6cca36835f150754a5590227d956fc245f10eb5d", - "sha256": "1wypvqs135dfb12mc954k53rvq48ljcc1l01fzkq7rwk543i182p" + "commit": "cb284929a6a1364d1200677de38a75d90edc6fb2", + "sha256": "0yc147iln4hpfv74jzaq6z53m52cannllwn5ffafya6qih5rl4hm" }, "stable": { "version": [ @@ -32326,15 +32570,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20231023, - 1521 + 20240324, + 2246 ], "deps": [ "inheritenv", "seq" ], - "commit": "4f9ae5d4d1fcb32c844b50ccda34305884d68be3", - "sha256": "1jsxdyl5sjwc2rwwg2j6ggxs7bvgsifsclqylv1lj3hjl8nhrjzj" + "commit": "94785b4bd385432ccd1bbabc73842cadb3357ca6", + "sha256": "02pfqsl9m1spwqzrb5x5f4rpys4laa0mjny5252qm2vc0rlp26xk" }, "stable": { "version": [ @@ -33139,10 +33383,10 @@ 2, 6, 4, - 1 + 3 ], - "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", - "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" + "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", + "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" } }, { @@ -33187,21 +33431,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20240214, - 900 + 20240321, + 722 ], - "commit": "b74bd21d5cb52e0fdc5ea321439c428783feea23", - "sha256": "1vjgmda8m2c2shdyk7dy4bspykrbsgvcs5s98fzxsqwf99l2xh20" + "commit": "e651174c569694c92b1794ddd0a1a4a199610091", + "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" }, "stable": { "version": [ 27, 0, -1, - 1 + 2 ], - "commit": "b74bd21d5cb52e0fdc5ea321439c428783feea23", - "sha256": "1vjgmda8m2c2shdyk7dy4bspykrbsgvcs5s98fzxsqwf99l2xh20" + "commit": "e651174c569694c92b1794ddd0a1a4a199610091", + "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" } }, { @@ -33774,10 +34018,10 @@ }, { "ename": "eshell-outline", - "commit": "950b9323c19b145bbf07a9a8f780880a2593831c", - "sha256": "1k510vsfsnhp86y2587zbc0cmaf735sp802d6qk7bgdllljl18hd", - "fetcher": "git", - "url": "https://git.jamzattack.xyz/eshell-outline", + "commit": "517b88019524e52bd41f65153151101a2e77c159", + "sha256": "1kn0s42z5wl21xzld80phvnvfqihkzwvz8v5xml9jvvrbvq92ps3", + "fetcher": "github", + "repo": "emacsattic/eshell-outline", "unstable": { "version": [ 20201121, @@ -33827,19 +34071,19 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20231108, - 2313 + 20240325, + 146 ], - "commit": "4ac27eec6595ba116a6151dfaf0b0e0440101e10", - "sha256": "123a2szd95nd43v2397087ayahp7azqm5arzh4fmqi1kdch4w3sp" + "commit": "1d25386bf7d1a97e083d33750a98fbd1c6598138", + "sha256": "1mvhp5arzhmkgpyq6kg0vlvaan8h67z3jjszazmjvgi5gma6jz1n" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "c134271b57f21910a6bdc5e395c7862791ed0a16", - "sha256": "1la604vdj56s934j16yz8rlvzhd69433rrbgfyw9c7njxqldwcs7" + "commit": "c43f83983dad5f89d842450b97239bb22b5236a7", + "sha256": "0maza5vh22psfxg5qavdayqr40aw8jc95bjiz5dwm0xga55clbfg" } }, { @@ -33868,20 +34112,20 @@ "repo": "peterwvj/eshell-up", "unstable": { "version": [ - 20240217, - 2020 + 20240226, + 1747 ], - "commit": "160e48a7e0047a2947923d1fc43a9727e51fb25f", - "sha256": "0xbcskq2ykwz0hpfjbgzh3gpjldx9y2jxwwdaibhv4j0cf9fyiyq" + "commit": "1999afaa509204b780db44e99ac9648fe7d92d32", + "sha256": "0kdqbnapgdk6p4sid9yjlk16sps2qq3xyh7j0jljn0c25qhqbw21" }, "stable": { "version": [ 0, 0, - 3 + 4 ], - "commit": "653121392acd607d5dfbca0832927e06806a2d39", - "sha256": "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3" + "commit": "1999afaa509204b780db44e99ac9648fe7d92d32", + "sha256": "0kdqbnapgdk6p4sid9yjlk16sps2qq3xyh7j0jljn0c25qhqbw21" } }, { @@ -33892,14 +34136,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20221229, - 1328 + 20240305, + 1149 ], "deps": [ "vterm" ], - "commit": "e96c30ad5e7d63b778fc3232e81b090b63b13277", - "sha256": "0zgf2yv85awlxc44cqbnyrzbkygxqp6hdqfskyg8qqjbm56cycvy" + "commit": "20f4b246fa605a1533cdfbe3cb7faf31a24e3d2e", + "sha256": "1akqxmgq8838v5nmxdldcgpvr3qf3qz64qsfnf90ic4mivdjgffy" } }, { @@ -34005,14 +34249,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20210731, - 1649 + 20240224, + 1517 ], "deps": [ "dash" ], - "commit": "3897d8a679a6e98e3f5054aaefe07f6b55f8f128", - "sha256": "0wx0mca7xykjkbyhix2mhqf2l9zc46l14hdy4krnr3xdyb5ibmkr" + "commit": "99665b66686cc5974499cec4aff1e29faef1c028", + "sha256": "1zx45ykwcg7in20725vafxk7wxa375vpgy0c56wm20g4vsyil4dd" }, "stable": { "version": [ @@ -34185,11 +34429,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240131, - 1041 + 20240229, + 2054 ], - "commit": "ab2faeca1ba6c456333312c58f58ef9e5ef4aa8b", - "sha256": "0jfdfqpa3x1zm65cllkzhqir057xd3hxi4z2ddii1i26zy56iikf" + "commit": "cf237253049583a547bafc16edb9eb9a52e1ebf6", + "sha256": "02zps4a404ijmngy2yx6sxj0c9hgs9383cm4byds2nw1jzhjc7wf" }, "stable": { "version": [ @@ -34824,15 +35068,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240222, - 652 + 20240324, + 1731 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "a7ffa73bbdc523c0e473d79c0ded7c6457bcb65c", - "sha256": "16npmdas70myr0nhy9fn7rl7nz2gcyqwnhbcky27a75j22vvfj9h" + "commit": "64a07c7aca2933ed1feec80704db49dc2c3476b3", + "sha256": "0m77bqnaqmqbd2w6710hplisbc9wwqhiymx63m7g2ddldzcmxyd0" }, "stable": { "version": [ @@ -34954,8 +35198,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20240103, - 926 + 20240308, + 751 ], "deps": [ "dash", @@ -34963,8 +35207,8 @@ "paredit", "smartparens" ], - "commit": "e8ccec32867e12d70a7cff5c70e4ac91f58dbd20", - "sha256": "1pyzn3knh9rbyzmk7jsb9z1vjsgvc020k2mjnsdl5szib5bvjm6m" + "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580", + "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw" } }, { @@ -35025,28 +35269,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240223, - 1627 + 20240321, + 13 ], "deps": [ "annalist", "evil" ], - "commit": "54e1eb02d918fb38b4e71c87ea9a8fe8f499dc5f", - "sha256": "18v3bnz7k5b2gnyp36dmmdxpmr7d1pnim31wpz91rmj5hs58qn8x" + "commit": "89aea406334bc251adb70b1d6070b24fa94552ba", + "sha256": "1w47hr75a1r0zdzp6f14ac33sk2kqvmrlh52nd1pxll0wkaxd2xf" }, "stable": { "version": [ 0, 0, - 9 + 10 ], "deps": [ "annalist", "evil" ], - "commit": "88e5ce8bdb0762119b4153ed3346b486029f26d3", - "sha256": "1y1ig4shqaaiiwqm5pv8hvh8ynr6irhffkgmpyzmhdaaicxnfazc" + "commit": "d0518fc1626f09a341d4b5a98c857087abfb1b0c", + "sha256": "09hnxb8nh3g0hi93fz9f1y164gv9iyh5994wfn6fsq2v1xdz8phm" } }, { @@ -35517,10 +35761,10 @@ }, { "ename": "evil-lispy", - "commit": "377d43f3717b8e17c3adce886aaf3e579383ec64", - "sha256": "17z830b0x6lhmqkk07hfbrg63c7q7mpn4zz1ppjd1smv4mcqzyld", + "commit": "f752bec984b45890e4d74ddd76cbadb0b3bf2942", + "sha256": "07xkijnsww6060b6x88x5jwaw49ndz2dmaa6cbw78l28s4xgpnhc", "fetcher": "github", - "repo": "sp3ctum/evil-lispy", + "repo": "mikavilpas/evil-lispy", "unstable": { "version": [ 20190502, @@ -35543,26 +35787,26 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20200630, - 940 + 20240303, + 1416 ], "deps": [ "evil" ], - "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", - "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" + "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", + "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "evil" ], - "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", - "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" + "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", + "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" } }, { @@ -36629,15 +36873,15 @@ "repo": "clsty/evil-tutor-sc", "unstable": { "version": [ - 20240215, - 5 + 20240319, + 233 ], "deps": [ "evil", "evil-tutor" ], - "commit": "9ae3cff4b1d44d74989e832cfa566c20bbe6bb1a", - "sha256": "1dqb1g6q8szknajr4rb9l2nra507k1qfmiwwx1mdhbvvfp3c6qjz" + "commit": "fcf8a588068c8fe591320d9e7161bf2d09b2e337", + "sha256": "1wf7bhhayj6x5657zy9ap014jlkkkvbkrg2v27h4y12cz5mc9i1z" }, "stable": { "version": [ @@ -37342,16 +37586,16 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20230730, - 445 + 20240303, + 1106 ], "deps": [ "f", "s", "transient" ], - "commit": "e008c89e01e5680473278c7e7bab42842e294e4d", - "sha256": "17r5r01br7k3nxy7vchhk94dz0zyrdlg66ip5wlj1kh89xwprvsq" + "commit": "5e8f6b681d4745ef23bd8f7ddafba80d6285f26e", + "sha256": "0jdkf8jfrw10rbd08k9lmknxpypkywnlm2mn2maz0bfb0cpi6lm3" } }, { @@ -37559,16 +37803,16 @@ "repo": "FrostyX/eyebrowse-restore", "unstable": { "version": [ - 20230312, - 1821 + 20240304, + 2338 ], "deps": [ "dash", "eyebrowse", "s" ], - "commit": "50e8a2cb3c4a64f7fadd0303d178de8a57bb37db", - "sha256": "0spcsg1kzz5h3y3m6jd3fz2mhfbmgfy4m35650axgx53309ivkfz" + "commit": "abb3877e12b41740305741deec37ca681b896e82", + "sha256": "125jnx9gvfcd0hg2aqsa4krj4ajiygricp4ill9s5200c24xwjp5" } }, { @@ -37652,15 +37896,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20231219, - 750 + 20240308, + 906 ], "deps": [ "dash", "s" ], - "commit": "634b0ecdeaa192ef0dd10db312a67ebe5c2d5852", - "sha256": "1ziaagd1j076c89w8kw09slmixhxhczi51a5m8wwmhhn4jks3f6r" + "commit": "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c", + "sha256": "07pbjgwnvjvbl1hsar6kjcy7f4390gl1jy712ln09vkiqn8ln5dq" }, "stable": { "version": [ @@ -38259,14 +38503,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20240220, - 1434 + 20240311, + 1417 ], "deps": [ "markdown-mode" ], - "commit": "ffcb84bb132a72c9d787b4f6d8481d27da623d41", - "sha256": "0a5zq7axxh3khx6465s7ym9s7v2iw7ky9z486d0zg41k7926bm9d" + "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad", + "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66" }, "stable": { "version": [ @@ -38356,11 +38600,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20240217, - 1848 + 20240313, + 32 ], - "commit": "0997a3853e56bfcd29167687f8ababcf8fd89c36", - "sha256": "0l5a7xgrdcrflv33f4l8sszjn0qnhmnljad5r7iwgsymz7jvav8d" + "commit": "4cdf20b673ed1eb14342d7a470ef75cbe165b0c4", + "sha256": "1hvmcnagrz4zwzadsx406hw0gsn66h5rd5y4891pkc260bi8mcyc" } }, { @@ -38960,11 +39204,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20220531, - 1555 + 20240228, + 1728 ], - "commit": "7b469ca0c22b7e6a907cd65eebdfa9723998a131", - "sha256": "1jgkgnpi5zmmqmm622p3cl0hj72cbag68c8mbi9bakw2fkq64xm2" + "commit": "c48f3f16a4b497b9e455966561bbb6638efe4900", + "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01" } }, { @@ -39037,6 +39281,30 @@ } }, { + "ename": "firstly-search", + "commit": "32c60a04989a3d985b963eb3e42fa3a78ea1bd8d", + "sha256": "14pg33kp4kr778py00719c9s7jfpcznmr28mcqdpsf714v5d0xq5", + "fetcher": "github", + "repo": "Anoncheg1/firstly-search", + "unstable": { + "version": [ + 20240324, + 1536 + ], + "commit": "5a5a60ba276c4362c371e44ff1cfa242b94eef62", + "sha256": "1bb4p9jaj7mn451zsx5wzsc9wrkzskg16g4cmxbvsfrlfxzfvicz" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "93d8b048187ae1e1bac4949c070ed4a8125e74bd", + "sha256": "1qp48fnf4ji8w4xn8sngknk79hwfwlk4cyz0717f0fmvk0wp7ias" + } + }, + { "ename": "fish-completion", "commit": "cbf0664a035ab6419cd78634ca583339c3bd1599", "sha256": "0hnji71fpp91ppy2pvm78r8q1zx5php1gjclhvglcc1hyz47kawq", @@ -39044,11 +39312,11 @@ "repo": "LemonBreezes/emacs-fish-completion", "unstable": { "version": [ - 20231028, - 2123 + 20240310, + 1442 ], - "commit": "99f0672c20ea61d21f106183e80f32c0c6525faa", - "sha256": "037cp4scia8pimn32j70vkf8c6rzipv1nm5r18z5v4lfdbiyyw0v" + "commit": "5e081b3c061cfd91a98aceb035bdc80240e6ff92", + "sha256": "16a9fdjwsh89ar3paprmks89z0ydijn3lqv0r8khmhpa9ljrkrg5" }, "stable": { "version": [ @@ -39505,15 +39773,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20231214, - 2336 + 20240221, + 1353 ], "deps": [ "apel", "oauth2" ], - "commit": "e9f4c56537704bceb2696c35b98466bc413d8d34", - "sha256": "0xpj3wmsi2jhq442r8s3c0laiyknsnbpysp0amjrk7h6lp87s4rj" + "commit": "23bb29d70a13cada2eaab425ef80071564586a6d", + "sha256": "14ihl59sj829hycbw182byk4npmrsmhcgl98j5v7i81vmxdfrcm9" } }, { @@ -39806,11 +40074,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20240224, - 703 + 20240317, + 606 ], - "commit": "ed010752df6ca0092107aeb22ff110306462102b", - "sha256": "09bncjxppn1snciznxm1g11anv40a031rg20ppqms0cxkwjn5acd" + "commit": "0c8de6de03bb1639552007f70a9c66ebdd382496", + "sha256": "0nc5fpggqckpnlxaaf0w517zr6xzamg25yj2hgrp19naqicl7133" }, "stable": { "version": [ @@ -42654,9 +42922,9 @@ }, { "ename": "flymake-clippy", - "commit": "86d2018564549dfa7d67c9bc9fd9a790ec9173c2", - "sha256": "1ccv32dlzrvihq69bi3c2anryj7zafvlpbga11f4zy31qfi6ad2y", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "09zkmrn580cdbywz0qrhpylw15m9l1rgfq6kngj6wcsznrl501a7", + "fetcher": "github", "repo": "mgmarlow/flymake-clippy", "unstable": { "version": [ @@ -42704,15 +42972,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20231231, - 1509 + 20240316, + 2135 ], "deps": [ "flymake", "let-alist" ], - "commit": "852d47f7b4cac7345d40bd16067842e095aee13b", - "sha256": "1r9cif3hpmf8lx4w9ac3lccgq1swwfgzh7slaa7ld0h5mmq9w23c" + "commit": "f1d889f166934a4d8ec0f0e159e179314c2e8791", + "sha256": "0ry8lmbsllsbk5gaywwym5fi1f001g3qzjzwzcz5xq1vim9jzlvj" }, "stable": { "version": [ @@ -42736,11 +43004,11 @@ "repo": "fritzgrabo/flymake-cspell", "unstable": { "version": [ - 20230208, - 2155 + 20240304, + 1349 ], - "commit": "c68bf7eef99ddb2fbd780f175e869df2db5d768f", - "sha256": "05k8aiiik2ws3hdppg6kv8avq2dc7mvn08hs28brrzm3d8h6ma65" + "commit": "a573c07142cd0142c4cc1affd57f96b4d5c229b3", + "sha256": "0qbf3wrx3p1c78jx7lmsz6ayp05hig6p0772mi27drz1yk2x5d8d" } }, { @@ -42961,11 +43229,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20240202, - 1548 + 20240322, + 2315 ], - "commit": "c783788fc1b6fa9703c623f651f4a72c11923d30", - "sha256": "09isnk70lxbgcfmq8v07fz7ml4pmqdj7g1i3a7k8mpnr1zixrbbh" + "commit": "6ab909b85a8e97815db9831cdd5f283a7830177f", + "sha256": "19jyim5rrmv8bdskaw8gxb6fch3jj3irqhddi2aaxvgdxn321yxm" }, "stable": { "version": [ @@ -42979,9 +43247,9 @@ }, { "ename": "flymake-fennel", - "commit": "9e090e0bf0894ff5b32b020c2b570646cd28a0e3", - "sha256": "1ajzb4wacg2qgqd6jchnxjlpqmp07cams1j5s1my6qyl5m3sgrvc", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "0kd9kd00xg89s5gxx24n4agcl0r910kkddmv8f4j8pflp2yh1lkp", + "fetcher": "github", "repo": "mgmarlow/flymake-fennel", "unstable": { "version": [ @@ -43077,10 +43345,10 @@ }, { "ename": "flymake-golangci", - "commit": "76c98b2e204eb2a733295037cbf13b60d1cad97b", - "sha256": "13p29d7b3pchyiw1rbdaif7h6jhzfg635ix8z2kzkqg9bvkxxr7y", - "fetcher": "gitlab", - "repo": "shackra/flymake-golangci", + "commit": "b282ee5729bdcd1d70f798e2d52b68905fdc026b", + "sha256": "1p8w5lhq1h2p2l7ws8hrsf9dgq5dqv1fhc42qf2230xm5scbq2x8", + "fetcher": "github", + "repo": "emacsattic/flymake-golangci", "unstable": { "version": [ 20191028, @@ -43403,11 +43671,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20240101, - 851 + 20240307, + 419 + ], + "deps": [ + "compat" ], - "commit": "bd2d2c05949e9d892ca1313d1012aff39528218e", - "sha256": "0yz6c028dykvcp8ajnjds63fnlf58c5m5p3w1y9hx3l1hy9qmgx4" + "commit": "73a1814db4cc387854d72828c0e188c9f5b4c661", + "sha256": "03sgfygr0jp3h7lnjl6v7j8rrcj5ib8qrvvijlqpk62vjh2pn4gc" }, "stable": { "version": [ @@ -43517,14 +43788,14 @@ "repo": "flymake/emacs-flymake-perlcritic", "unstable": { "version": [ - 20120328, - 814 + 20240229, + 953 ], "deps": [ "flymake" ], - "commit": "0692d6ad5495f6e5438bde0a10345829b8e1def8", - "sha256": "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq" + "commit": "f65ac37608b78ce785808c27fba86a8102a4ff95", + "sha256": "1hyjn4kqf3wcnw4gp859x1kdaf9fin482cws1ln41vld0cv4bqbc" }, "stable": { "version": [ @@ -44302,6 +44573,25 @@ } }, { + "ename": "fmo-mode", + "commit": "2dd41f2de377b64c3ae78ab2f93bf6b9d8dc6f7d", + "sha256": "0hhdxl951vsfz33kfyx2xwjyjd3295jz1nabix3r92shcqxmq9n3", + "fetcher": "github", + "repo": "xeechou/fmo-mode.el", + "unstable": { + "version": [ + 20240306, + 1442 + ], + "deps": [ + "difflib", + "format-all" + ], + "commit": "eb63a36ee8ca0ec985e6fd043db974e6f9b38c83", + "sha256": "1s36a9kv30xs7ac3niq9dz0bany69w8bhl3yqddsryjsyrbdc9i5" + } + }, + { "ename": "fn", "commit": "6d2929604b6dd21d6cf425643927a9c216801dc1", "sha256": "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn", @@ -44478,11 +44768,11 @@ "repo": "jaalto/project-emacs--folding-mode", "unstable": { "version": [ - 20231003, - 959 + 20240308, + 334 ], - "commit": "f6fc3af1de39ac94b1642595232457b9060c3f45", - "sha256": "1s2adff853w1ix0s1zapqcql4vhmyy56rixkcb06niv5pr2pwpg7" + "commit": "b27c4a1d19e8b91777be0e346cc0ed7c73e2c446", + "sha256": "06g07ndxkz1nrbar95aa1vwp0jdz22x4l1j6mx0pllfwffaxn5xb" } }, { @@ -44744,8 +45034,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20240219, - 1113 + 20240324, + 2106 ], "deps": [ "closql", @@ -44760,8 +45050,8 @@ "transient", "yaml" ], - "commit": "4ec54211b2cb695ad8eb5b395bbc9b522f600797", - "sha256": "1yjbz8d2jq90yn2scgiwad3ycz3jcyprnxgz59rp0j11a26d08rv" + "commit": "2a3b41eb6235b3f39c017c1f86b3928a45c5a64d", + "sha256": "09nxkknp4f66v4s2hyfxyhg2qgzzcpzw7xsb8v16p9k5khnkrh8m" }, "stable": { "version": [ @@ -44979,26 +45269,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240210, - 1105 + 20240226, + 245 ], "deps": [ "seq" ], - "commit": "68fa4e62d86e0d636f0aaccd101ba1b887597424", - "sha256": "0skqm9gjf0sjqx8pl2s789rpyady17zwvnda10lxzqv1cg4vn74n" + "commit": "20e2fc4aa62d27a48c092761e77d65b64d55a3c5", + "sha256": "11c09a470v61cwi0662615q8l58sxd2mk6zqbvrp5g14w8470hgs" }, "stable": { "version": [ 3, 7, - 1 + 2 ], "deps": [ "seq" ], - "commit": "e2c0b952b297d99dd16f2d55f883eec8bfdfa896", - "sha256": "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298" + "commit": "561982bde5fc4f53f72cebe53e0eea53051ef0e7", + "sha256": "0xy45inihqwaix49vxr5yiqyps4r2djkzdd4g7kkc0fv7kzrm1m4" } }, { @@ -45631,8 +45921,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20230506, - 1606 + 20240312, + 1632 ], "deps": [ "company", @@ -45642,8 +45932,8 @@ "quick-peek", "yasnippet" ], - "commit": "56039769454d3b71cad7248d144d04bb6f97a522", - "sha256": "15wfp8yckh5k9sg72ky5fd0mma7ancj26d73anlg2h00njshqpsv" + "commit": "6e5d3ea858f3c8a9d01161d9089909c2b22fdfca", + "sha256": "1z1mcmmrfx1nx3d3374wb7qykzdc3qh9ssgs2wz7b5vnv9cbdfn6" }, "stable": { "version": [ @@ -45827,14 +46117,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20240103, - 159 + 20240224, + 1641 ], "deps": [ "flx" ], - "commit": "4080b373f3361126d4de1f063bb08718b0c08eed", - "sha256": "1x0vmbxd0ggslkxcam5da586plsjar9v5nka0dbxdkwx6k6n23r1" + "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439", + "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f" }, "stable": { "version": [ @@ -46480,15 +46770,15 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20231227, - 1512 + 20240314, + 1950 ], "deps": [ "geiser", "transient" ], - "commit": "6e0811c75d13c3c8488e7a11a018e1ea2ae3288a", - "sha256": "162hfssivp36m58siqszli8sjkfxg9b0dsdpn54alj80sjalkx46" + "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd", + "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5" }, "stable": { "version": [ @@ -46817,16 +47107,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20240221, - 2200 + 20240306, + 1947 ], "deps": [ "dash", "magit", "s" ], - "commit": "f327a5c4ec9f508e7caac622438168ff3bc29fd7", - "sha256": "0pj8g15firy6pqm7plry63i79xp0l9n3c6bx17sln0dv4dyj8z8x" + "commit": "8a98747155712d751239e5699e3a6fd090848b33", + "sha256": "1l02fm864j7ml8anm9ykf9yd5x8r12zrn2p4psadxpzkqa5r5zg0" } }, { @@ -47125,16 +47415,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20240218, - 2101 + 20240311, + 1716 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "c59de91717c2343ccba3adb9047d846edc35bc36", - "sha256": "02cs2min8kg1rnmjm2kvn2xvbmr7dsl0jgsxknqikc44d73a0ipy" + "commit": "132631529c2e3e75e15608658aed5adfbb6b7409", + "sha256": "11cih7igq5amv7w5k5fql0c0plfmgqnkv5p36a2dl3mzk96d8mkn" }, "stable": { "version": [ @@ -47460,14 +47750,14 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240220, - 1913 + 20240304, + 2323 ], "deps": [ "transient" ], - "commit": "0bc7b66d78058f5d41e9adb891d6fb29085153ee", - "sha256": "1szbfxy3lc1y8ax3gbxs5spkdjshrpq537yaxd85n9mrv19s3xv0" + "commit": "be4b22a2c0d638cf1e5d52acc96933a443d0ca23", + "sha256": "0v8jibs3drq2rlmnpjw7ar4zc8fglka53rcqdcmshbq2jh96z0fi" }, "stable": { "version": [ @@ -47523,16 +47813,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240221, - 1445 + 20240320, + 2311 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "09961f67a403c53b62669f40a088d5720dc77270", - "sha256": "0sw5lwk04yi0840yqyga7v82mjkqvflwi3pgsq02mrdbc5w4wx1m" + "commit": "4d378d91d245f68a972626c4076a6558d1c19dce", + "sha256": "0vix49448b79sxvwzxnij2q7nsv525y5qx814k3q0s80zwd4ny2v" }, "stable": { "version": [ @@ -47816,20 +48106,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20230518, - 204 + 20240303, + 1546 ], - "commit": "aded95807f277f30e1607313bdf9ac9a016a2305", - "sha256": "0mxhmza01837hqq1pfi6jf8y2bw48k74bccddlzngaa22xiz1d21" + "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", + "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" }, "stable": { "version": [ 0, - 8, - 6 + 9, + 1 ], - "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", - "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" + "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", + "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" } }, { @@ -47957,14 +48247,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20240219, - 2108 + 20240309, + 1109 ], "deps": [ "transient" ], - "commit": "69474bfc653bb076f94d97d22903e2299a3d8a8b", - "sha256": "02grsmgslvbm67g85iv2xq9jq3wj9xi16gn0dqrgrc96hh63mpjh" + "commit": "5ed73c3831cf6da10ba941e6abba708a86853e8f", + "sha256": "1cx2rqv1c162bpf6dn01arjbyqlaxjgr1a674bsvwjin3rwcx22j" }, "stable": { "version": [ @@ -48984,28 +49274,27 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240222, - 1347 + 20240314, + 612 ], "deps": [ "compat", "emacsql" ], - "commit": "6ee271486b9a2c1467434bf6c23cb804f905a0f2", - "sha256": "1d9limkb3ydfbhxdcycqv7nh1qk3kwp35c85c1xlhqh761rcl516" + "commit": "78e066b94809fb7746086a1ca6b7d7c39d353343", + "sha256": "11kj6w1daqhblrmvc2zhzd17j5kq1nzrmn3379f80y9gjp4y1blk" }, "stable": { "version": [ 0, - 1, - 9 + 2, + 0 ], "deps": [ - "compat", "emacsql" ], - "commit": "6ee271486b9a2c1467434bf6c23cb804f905a0f2", - "sha256": "1d9limkb3ydfbhxdcycqv7nh1qk3kwp35c85c1xlhqh761rcl516" + "commit": "3433d348e214cff704c2bef1a855c0ea655ad32b", + "sha256": "0y59cc330348yjfw346smc3fha7r0l7zxppydllax31hmx3g4k7d" } }, { @@ -49709,28 +49998,28 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20221127, - 1342 + 20240322, + 17 ], "deps": [ "go-mode", "gotest" ], - "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", - "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" + "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", + "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" }, "stable": { "version": [ 1, - 8, - 2 + 9, + 0 ], "deps": [ "go-mode", "gotest" ], - "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", - "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" + "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", + "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" } }, { @@ -49911,11 +50200,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20230503, - 303 + 20240313, + 356 ], - "commit": "59506f69503cca65291fa5ccd0a326e716338c23", - "sha256": "082xczdxqjbrk0nsl6l0223jh3vhmjni438wa4grv17md1pvxy02" + "commit": "377375c87f64e7d069c8fc310ccfefd8771226f3", + "sha256": "1p5acy25ap0lpnv178xrkz2lyjppsfss8vcqarjpvd1hv40wfv5m" }, "stable": { "version": [ @@ -50539,8 +50828,8 @@ "stable": { "version": [ 0, - 35, - 0 + 36, + 1 ], "deps": [ "dash", @@ -50548,8 +50837,8 @@ "magit-popup", "s" ], - "commit": "d7c0094aa2d4dd3cb0da572106793d11078c5c47", - "sha256": "03ffg4ypfrnj8qmip0cdkgifrxasb1wi05zpvg1mmdyx64sr1f90" + "commit": "cc533e4b14c522d0cc44ee646b0a36c408c10425", + "sha256": "12vd1xzmj9140a4hfkjmxg5mdj9m03nk31yx9yq1mrgjd89xxp6k" } }, { @@ -50703,28 +50992,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240221, - 811 + 20240321, + 1740 ], "deps": [ "compat", "transient" ], - "commit": "8ba07d042c11cb65ebce69fc1dc069905ec00e5e", - "sha256": "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw" + "commit": "12e00cbd092de95ae7f11aa207cd41dd9fabf883", + "sha256": "0ri0saa5750nay1ck46lxa6h21nxh9sgs0n1khr92wda1rinh85g" }, "stable": { "version": [ 0, - 7, + 8, 0 ], "deps": [ "compat", "transient" ], - "commit": "8ba07d042c11cb65ebce69fc1dc069905ec00e5e", - "sha256": "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw" + "commit": "5dcbf40066f5b6fba27af7bf610348dbd781751e", + "sha256": "1n3kdylv50filla692j2vcjalw6yza80xlg90cw54m9jp9br8sch" } }, { @@ -51813,11 +52102,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20231224, - 1844 + 20240304, + 525 ], - "commit": "2d91bf3810ee93fad57772983720f77e9f534b61", - "sha256": "0l6hk7q1in9zcclpxd1nsjj7sggg3gzqhj2piffg31xfl7f62r5r" + "commit": "223d19ffbd6296864a775d18025150ccbcbc7800", + "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85" } }, { @@ -52044,11 +52333,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240125, - 557 + 20240227, + 1029 ], - "commit": "73fd0027b3ef4ab1b9f368ae5f60676177471900", - "sha256": "0yh8ph27c5rmgxrr91kl02w397h7hf7ldjkjr3p21r75w03hymmq" + "commit": "0854346035d9070d347e4de710af41b293b85fb2", + "sha256": "0xb4bgb6cd92h7s0w440b25jli5ss7j910njrfmp5ifwraxjl0jm" } }, { @@ -52225,15 +52514,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20231123, - 552 + 20240306, + 3 ], "deps": [ "svg-lib", "ts" ], - "commit": "61188c66897fcab359ee555cd30c384a968af64c", - "sha256": "08b1minjvdd3h2smav5lcpvz8b6qdi73bd8a7n5i8wnzxcqhx2s8" + "commit": "d06064633cb142cd52bfa65400fd243eb656ada8", + "sha256": "1gk7plcykxzi148cm2z0j731ag01fn54sj1k58nqy541n21qgk9f" }, "stable": { "version": [ @@ -52861,16 +53150,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240221, - 1816 + 20240320, + 1528 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "0b355b3cd447df2cf96ad32577b0910770d20c25", - "sha256": "14jyzgz300mx0724agb1jnaixykqrvyblqkik17why0v28jqj2sx" + "commit": "eae4f5a24a2a5d9fac0ec1a9200362bf9efa911b", + "sha256": "1szf9whxq9xd3nn45wg0y6z2xc3g8rcahh3v28aw1v7p7pj5f1y4" }, "stable": { "version": [ @@ -53754,14 +54043,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240224, - 604 + 20240324, + 1909 ], "deps": [ "async" ], - "commit": "56ff07ea90284f5303be5fcaddaaa144e0c3396c", - "sha256": "1dkbrlrnn2lij1fbxbsxaaj29zyf504pv7bjdy1v0pmf1yhxdglp" + "commit": "8068f5301cd1a8495dee6882de99ffec6f89f55f", + "sha256": "0h8g1hjkslhbm371kpsh1gqipl4zlva2fnvgqyspqmgmdpb8g49i" }, "stable": { "version": [ @@ -55370,14 +55659,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20230924, - 1610 + 20240315, + 1721 ], "deps": [ "helm" ], - "commit": "35b3a548694039463749cc18bd628e8f4e3c8019", - "sha256": "0j762wgwmyls60q8w3g960c0b6ba2l0p91iqylz03ww1ipgixrwj" + "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b", + "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4" }, "stable": { "version": [ @@ -59143,14 +59432,14 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20231231, - 854 + 20240229, + 1231 ], "deps": [ "cl-lib" ], - "commit": "fc61c312be7cd23c654a02f1f81355d562cd627e", - "sha256": "111l502krbrpzm63kbiblchiav8wv38z11snvcx428xjzpl28q1l" + "commit": "11d05032af3ffb895c7b1a1845fea7ffe3be4fbf", + "sha256": "155zp3hhb8i7dp2f5vz3yca8gzrzg0psxak17rfa9j1lk0zgqyr0" }, "stable": { "version": [ @@ -59763,6 +60052,21 @@ } }, { + "ename": "hyperbole", + "commit": "eeb6ed97ff5b0e63f5f10a4339d8f790806a6efa", + "sha256": "0v48smnd7bm65mjz2waahyi2favbsmynigya5s6xyhx0h6y3apxv", + "fetcher": "git", + "url": "https://git.savannah.gnu.org/git/hyperbole.git", + "unstable": { + "version": [ + 20240322, + 1628 + ], + "commit": "2a10d5edf945a2faa89e59744a3b37ede7496010", + "sha256": "0nqih5cqbcs5l2s2kz57682gmkcajd3h7vlvs7nhkril99s85c9g" + } + }, + { "ename": "hyperdrive", "commit": "e6a45576a099fd1a5c6f9e5761f90153bfc1b33c", "sha256": "1jcjmbm36j5s8w6wi6rxhr2khgwks07q1vfhdr1h20gz9ijikvna", @@ -59770,8 +60074,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240207, - 1949 + 20240226, + 743 ], "deps": [ "compat", @@ -59781,8 +60085,8 @@ "taxy-magit-section", "transient" ], - "commit": "8c41b805a522deb86e8b496090769c7251345115", - "sha256": "1p3pf0fybxv5v5sqhrr1yypjba4sl284px575s87ihcrkfjc9bwj" + "commit": "9895acdd1bc14e9a63e3b6ef050510a67ae59e7d", + "sha256": "04x951f267gca33vjlzq4fh1xk1py9m9v8qkbsygv19rhqicad4z" }, "stable": { "version": [ @@ -60886,28 +61190,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20240204, - 1321 + 20240322, + 953 ], "deps": [ "ghub", "transient" ], - "commit": "f83141db9a962cfe039431fa440f9c09ec8034ef", - "sha256": "0kj8kjz9324x4hw52rfn71h6pmb2svvbyzi1mkxzyrhhgwjmzbp4" + "commit": "051a58085cd9593665c59c75208cc10189b53504", + "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" }, "stable": { "version": [ 1, - 5, + 6, 1 ], "deps": [ "ghub", "transient" ], - "commit": "e588d2f625ad5f780572e144145e789a764af1b0", - "sha256": "0vz8xzdl87wvkvlawr0ph9s20r263qks9kp5b7g2hv2zng6wr3x5" + "commit": "051a58085cd9593665c59c75208cc10189b53504", + "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" } }, { @@ -61258,11 +61562,11 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20230219, - 1703 + 20240310, + 931 ], - "commit": "20417eaf6f349b3707e515d5d7817896243a8ad1", - "sha256": "1xymssi0kyipgy9dyda931795xpvr1afnisaccl9yq53rzibwxfx" + "commit": "a0a53a1fd9ca8dfd1d56fb45ab548ad900235a7a", + "sha256": "06ggjnb4dir8zrasskl44hq9r2fcw5gb26gyfh1580zyzjvfp855" }, "stable": { "version": [ @@ -61512,11 +61816,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20240101, - 940 + 20240303, + 2359 ], - "commit": "27a545181d629e286009d313c60ce10abc407610", - "sha256": "0i9ny5pfxcjf1bp9jxgsy2k88xgvllc46pbg3niyw4hrvzk9nwbx" + "commit": "4ede831b8680946f8e4a6cafd4f522c464160c00", + "sha256": "0pjd6mdhf5x9nkm2g5bqgav6ii15gs8d74kj3bigqkfv0m3q5s53" }, "stable": { "version": [ @@ -61650,15 +61954,15 @@ "repo": "Fuco1/indicators.el", "unstable": { "version": [ - 20161211, - 1126 + 20240321, + 2029 ], "deps": [ "cl-lib", "dash" ], - "commit": "f62a1201f21453e3aca93f48483e65ae8251432e", - "sha256": "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6" + "commit": "9b80c4545fc5c50332b2748c30d492517ae583b5", + "sha256": "1dx93qlzsl5zsinslgybd1lca6962dinzy91ndqijj7sicv9nd0r" } }, { @@ -61821,11 +62125,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240127, - 1832 + 20240310, + 1803 ], - "commit": "dac615c7fdbb57587465b1c497f8be4c979439e1", - "sha256": "0hw8n62cnxms88nrcyj6rfp3nil7r3l3kjykw7nv366y77mczvir" + "commit": "b88ff8bd5fe2e468de611b0211842634beaeb5da", + "sha256": "1qq5dnaj7nyhllg6kx7h2fgk8bisvn35kc4i2d4xsgpsf11293wp" }, "stable": { "version": [ @@ -62130,14 +62434,14 @@ "repo": "chaosemer/init-dir", "unstable": { "version": [ - 20240216, - 1758 + 20240320, + 2117 ], "deps": [ "benchmark-init" ], - "commit": "3b2320a62e0b2c39ae001381ef3e9ee0d538f146", - "sha256": "1irki93sz709rkp8ma3s6b9hmz99l67mcimqw316vqc583kkj2l9" + "commit": "90abd62ab6d2db311c92671c73228d6d80849930", + "sha256": "1jd0wm6lf6jrrm5c3yd96rwmmxnnzqk89n8c1l6gsnyxb01cnnc0" }, "stable": { "version": [ @@ -62710,11 +63014,11 @@ "repo": "csrhodes/iplayer-el", "unstable": { "version": [ - 20161120, - 2120 + 20240305, + 1633 ], - "commit": "b788fffa4b36bbd558047ffa6be51b1f0f462f23", - "sha256": "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g" + "commit": "62d3ca74e4f4d4f72f17e9075b06d0ba561ae5df", + "sha256": "0gspa6bmahaqk2vkjx5m6hzr5vcm6r2ks9aybgjw59fkdkp08fg4" }, "stable": { "version": [ @@ -63845,27 +64149,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231123, - 2208 + 20240226, + 204 ], "deps": [ "ivy", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -64205,15 +64509,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20230715, - 456 + 20240306, + 524 ], "deps": [ "fsm", "srv" ], - "commit": "c52d60d0a1fd209301c8434634259946c61a5f53", - "sha256": "0hncr3jjipg0hvbspzslyswrr7qyxlln3s15z4f7snsaflmrzsdg" + "commit": "633cb73633143ec093c291af94b008f456037e8b", + "sha256": "1agbcbqvfdh0933b1rzsnmv27kfr8ns3202bgpqhnnvpn2dmp448" } }, { @@ -65002,25 +65306,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240223, - 1312 + 20240311, + 821 ], "deps": [ "compat" ], - "commit": "cd63c27767d655319f89432ed1feae1cae12cdab", - "sha256": "02nc3aha4alhw3qm119hciy3xmrk829vgq4a1dxn04m8qf01fpy8" + "commit": "b09efcb85b1a8db8054a3d5a298e8d9516836f16", + "sha256": "0dyfj85h54v3q8fb5sni3xvan78np1xrx4w2mnbsf95z4kac91mh" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "cd63c27767d655319f89432ed1feae1cae12cdab", - "sha256": "02nc3aha4alhw3qm119hciy3xmrk829vgq4a1dxn04m8qf01fpy8" + "commit": "b2ef3af2857896e20cff0488c46a4bfcfee39ecc", + "sha256": "14zamk2s20f6dnv23v9snya0mi1bs2nq6xpp5bj06kiymzwhcqjw" } }, { @@ -65274,11 +65578,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20240115, - 1512 + 20240304, + 911 ], - "commit": "37028e120041a489eff352b79202361cb232377e", - "sha256": "1dhrcdjc8g830zdx35xv55j1jnrxb9kb6ai76xfg32icr1fyaf4p" + "commit": "d533567a680bc87060c56a50f83d80e58646d2f2", + "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai" }, "stable": { "version": [ @@ -65298,11 +65602,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231111, - 208 + 20240305, + 1511 ], - "commit": "0201e351ed0074a72c0987282079c775f3c8fe52", - "sha256": "157f300w61dq9s11f71p4z0nykg8h1f64rnpy3199y6sfjhhglyl" + "commit": "9e6a2aab79a973e1200b8e4b5e6f1762b29b0dec", + "sha256": "082sfn63as6sfsf13ziplyag7nglyc3baf2fk0hwz37y54ada35y" } }, { @@ -65541,14 +65845,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20240221, - 351 + 20240310, + 1755 ], "deps": [ "cl-lib" ], - "commit": "e7373b0e0891b2521d8f9b9862b77607317b2f39", - "sha256": "012yc87dv73w9fsccyfdm7ihrc1n39axs4kgw2zj31w48sv1vh1w" + "commit": "e92829da3d6387252a0a5737c0c5344cb3de1578", + "sha256": "163s57j12fcigr096m3rgw07nnhs099dij6x4k9vs3005jy43a8p" }, "stable": { "version": [ @@ -65722,26 +66026,26 @@ "repo": "json-emacs/json-mode", "unstable": { "version": [ - 20240203, - 751 + 20240228, + 1443 ], "deps": [ "json-snatcher" ], - "commit": "bfd1557aaa20b7518b808fdc869f094b52205234", - "sha256": "008dlgqm9l9lk12njig2hbsfqafw42169qdh0z8qq0flqmnm1vqj" + "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", + "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" }, "stable": { "version": [ 1, 9, - 0 + 1 ], "deps": [ "json-snatcher" ], - "commit": "a93a0c76784376fbb9105719f25c7489991056a1", - "sha256": "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s" + "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", + "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" } }, { @@ -66062,20 +66366,20 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240214, - 1136 + 20240315, + 1515 ], - "commit": "f2bca05283222e4622b54d1a42b704966b363331", - "sha256": "0hz4h7b1wnq1l7yrcy078yd2qjnsnras1lr2llrangf9gfzrif4p" + "commit": "e2fb775b30c2eadd33413d6b1dbdc41ba155c1fe", + "sha256": "1215g39mryl36ag5l1pbza7ll1wxd5q37kf8m90dddv9kkzag1a2" }, "stable": { "version": [ 0, - 3, - 5 + 4, + 1 ], - "commit": "781d140a8d3115a9567d797ed73ec32e21db4679", - "sha256": "1yci9jhrdlmfi51qvwv2v6p1vl1zaz3xa5h4rx94gv2vi3fvg4v2" + "commit": "cd84f2d021d8fd1b06dc594bea2f7d8ce753ad2d", + "sha256": "1k3rqi3kg84b420m91ycw7r2j42r17jks9a6v0b57lcdcvjbyccz" } }, { @@ -66104,11 +66408,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20230712, - 1524 + 20240315, + 1726 ], - "commit": "7a8c868e0d3e51ba4a2c621ee22ca9599e0e4bbb", - "sha256": "0xwd4kq69ray6bk8hwjxnqf7myc3mn36chc2l9jn7a0x1f8x6k10" + "commit": "2dfc869ff6b3878407fe7226669dfaae8d38d541", + "sha256": "0hqriyh857rvsdhp3pvv3diikaccf7lrjszpmkaaxjyr0d93p2z7" }, "stable": { "version": [ @@ -66175,8 +66479,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240205, - 2228 + 20240310, + 1510 ], "deps": [ "dash", @@ -66185,8 +66489,8 @@ "s", "spinner" ], - "commit": "ce6994a548c3da051eb9104cad2c1056aa3cf4c1", - "sha256": "0p3wffd2013nd9322k543ql2z9w8826c4basm3w7wq2c1ckf8q2f" + "commit": "a25ce847480a0c2bed24fad3f1ee62904c9c93a5", + "sha256": "07pcdfccsjf51389nivrxiqldvrb2gywqin7s7qy8ci684c6cpzi" }, "stable": { "version": [ @@ -66433,11 +66737,11 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20230303, - 2255 + 20240312, + 1626 ], - "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", - "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" + "commit": "57d854c26033c2f629b63fa4be90236fd3015278", + "sha256": "0lxx22hp1j7q6cjr5ryiymkf7d70pcn5blihrd45h0h5swjx85fl" }, "stable": { "version": [ @@ -66666,26 +66970,25 @@ "repo": "bram85/kagi.el", "unstable": { "version": [ - 20240214, - 749 + 20240323, + 905 ], "deps": [ "shell-maker" ], - "commit": "c32eb03aaf033a23214507d7f4edd31cf0a3f182", - "sha256": "1y6mb8mr5rv8hf11jwdbh89nwpi2y2ibvd7jfrpfbb4dbngyblq9" + "commit": "407781fe4e24e7c57a4751c43b16ae6a69d297f8", + "sha256": "0nfsnx4ll3m8h4pj69kgcc8jn3sbldq3xgj0wkrr4x672fg6nyil" }, "stable": { "version": [ 0, - 3, - 1 + 4 ], "deps": [ "shell-maker" ], - "commit": "6627fc20d297afd80392488651fd46e4df051a3e", - "sha256": "0w1nkk3j3hl2177f4gw4z62wkmq17gdrybsh30i5q6rmq97ilhr6" + "commit": "0570505cff30bf03afc44c4095791c99add9d11c", + "sha256": "013w68r9205m8q5vhzihawqvaliilspkzcs1n7ky9kpfvysqfnbw" } }, { @@ -66801,11 +67104,11 @@ "repo": "meritamen/emacs-kanagawa-theme", "unstable": { "version": [ - 20240120, - 647 + 20240325, + 305 ], - "commit": "7277c9230c27f927fcde3dc5303a8b6704062ecf", - "sha256": "0w3vi358gda0p0ir7yxwxn7j397nqq3rc4v9qwcr3xs1ddj9f678" + "commit": "fcc2960a911c74e041bc04a4c4b7fecf97f3d176", + "sha256": "0npqpbpqy5x4f6zj4gjlg6pv8ip935hv2wffid13rgb6pnd5w27s" } }, { @@ -67280,14 +67583,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20240117, - 1559 + 20240304, + 1916 ], "deps": [ "compat" ], - "commit": "5ed2e122ee6fb324336ce12f7f260c404db1290e", - "sha256": "0jzxm6h47wn405ra7kk2rjhadngj3jb27xb5j8xri4xxdmdn0mhh" + "commit": "ec90b16baa0e9e7eb43d8c38e6cf6dccf75a95de", + "sha256": "19sjfydyagcr3vh989c8v0payd36qj3al4j00jwaj49qb3ck8g25" }, "stable": { "version": [ @@ -67629,28 +67932,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240220, - 2212 + 20240314, + 1838 ], "deps": [ "dash", "transient" ], - "commit": "b1c86fee3b5d14f099d2d4b47f411aaa8318d650", - "sha256": "1pyz4k9zky1j3l6bvf0cjw8am093ss5vwpmynvcdgpbgzj49d0s2" + "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", + "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" }, "stable": { "version": [ 1, - 6, + 7, 0 ], "deps": [ "dash", "transient" ], - "commit": "b1c86fee3b5d14f099d2d4b47f411aaa8318d650", - "sha256": "1pyz4k9zky1j3l6bvf0cjw8am093ss5vwpmynvcdgpbgzj49d0s2" + "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", + "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" } }, { @@ -67875,14 +68178,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20231227, - 2145 + 20240227, + 1145 ], "deps": [ "compat" ], - "commit": "cd4b9eb31fcd0393ea5614608e18e20dc3dc95e8", - "sha256": "10q7420n7gs9vl6i55ss1mdl76brl7fj0rrfrcfdc79xfai1qk17" + "commit": "ed9214329f11b095fc7bad06feb329b9f232258d", + "sha256": "1l9fcz0hj0z88rzamwwrslzkm8gpbpqvvghr3bpxjln8i0qgkasc" } }, { @@ -68086,11 +68389,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231222, - 1345 + 20240318, + 1601 ], - "commit": "c884b3442806a21cbcf28ac24853f05da8ac6658", - "sha256": "139a201kd8hg21jrkww86xdjwx4r586cwv9i1ypclb4mswjahgay" + "commit": "5cf2ab3a50ccae4eb23482f5d0a615fa2d22504b", + "sha256": "17qdsfb5vbfk1dfj5314xq3i0k5gk1l9893pqbp8ijad0hs5lvl5" } }, { @@ -68184,11 +68487,11 @@ "repo": "terjesannum/emacs-kubectx-mode", "unstable": { "version": [ - 20230914, - 553 + 20240312, + 2024 ], - "commit": "3153c19a28402a515c53ce22ccc08e750597182e", - "sha256": "1cbh5sipwdvr2a8fq4dxglp1vhsxzqyakvg61hv08nbskqadvh89" + "commit": "b177c0fa9f8471d6199df4598afde1e39e83c504", + "sha256": "0yclqnjlvdhql736yiwwri4gy40b75ll3v6scp6mms4fa5969xd6" }, "stable": { "version": [ @@ -68514,18 +68817,38 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240126, - 841 + 20240317, + 1949 ], "deps": [ + "async-await", "compat", "f", "memoize", + "promise", "request", "s" ], - "commit": "db4c0ec1fb11670ff8218ed088d191e3121a7696", - "sha256": "09n3hsn6w68k7krh7b01rhx084qg998fsxh6n8vsqmpi4mmn4si5" + "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", + "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "async-await", + "compat", + "f", + "memoize", + "promise", + "request", + "s" + ], + "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", + "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" } }, { @@ -68628,16 +68951,16 @@ "stable": { "version": [ 2, - 4, - 1 + 5, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "5898e7c56ec58a24586d1f48bce02516cd44b0bc", - "sha256": "1b79vc1bk64cda4x6i7f5qih0xajf78wqmvyanjf1v2jqpwbj8aq" + "commit": "3730715c845c0732b912e10e14391350c327b6d3", + "sha256": "0cbs4nhj4lk6sj454vf6kfsljidchhh9h2ayn611kn9xd95hr082" } }, { @@ -68905,14 +69228,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20230810, - 542 + 20240318, + 855 ], "deps": [ "auctex" ], - "commit": "968f38f0699c72ed5e8be2d0531424d16280f0f4", - "sha256": "04ivfpp1rm4zf47s11qkc9g1dnvymy5xm62q842g77icf12vgv0m" + "commit": "8b6bcd562c8ba5753551f7a6837b01b562b6439a", + "sha256": "0qqhxbxynii3sqywqvni9i0r32jrnljriky0fsfs8bf1sndzpdc7" } }, { @@ -69550,11 +69873,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240117, - 1230 + 20240324, + 1619 ], - "commit": "11e748d4838d51772f531a75849349ed8cd939ed", - "sha256": "1k64n4iickm40v6h89kqqz579b8idsgqzhmmg8da6ahxk1kgghf1" + "commit": "34a74306ec9e0f542fd421fd4b7edd2e99d8e94d", + "sha256": "1fpgzkjszyd4nrxp0qxn8r7475rzplvz7clm4j4agv7nzjkp8m0m" }, "stable": { "version": [ @@ -69642,27 +69965,27 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20240223, - 949 + 20240313, + 1154 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "97db37fcb62d44a6bcab4fa8411a32cd902c2076", - "sha256": "1fm6bk69b9nhyvxdsm9d7zcbnwg5n659bl35ywvz8xlh87ymjz23" + "commit": "48caf7b856efc0c98f5d735dc605fbe0db793ec5", + "sha256": "181n1ng8nlx3dkj9lhjjva80a9i4xz6lj3yajzmf36y2b35va6s9" }, "stable": { "version": [ 0, - 17 + 22 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "97db37fcb62d44a6bcab4fa8411a32cd902c2076", - "sha256": "1fm6bk69b9nhyvxdsm9d7zcbnwg5n659bl35ywvz8xlh87ymjz23" + "commit": "0e7372d4ce133aff7d0a2b79d1f66e5e1e9efc07", + "sha256": "12g16gq9qawhlj92jgxr2l7xcc0ikvmwsygjcr3qyxy0bawynzr8" } }, { @@ -69688,15 +70011,15 @@ "repo": "phillord/lentic", "unstable": { "version": [ - 20221201, - 47 + 20240303, + 1456 ], "deps": [ "dash", "m-buffer" ], - "commit": "6af878392e127e75409ae0f4bc08837a8f591d88", - "sha256": "134rk1kcfkqnzhn51c0vvkj4839d5lbn0g61bqfpkgsvfpn05wh4" + "commit": "180c1082c016de790f9e6596b63329657c83ce20", + "sha256": "0kq7j6cx4jgaj8ll3vyfwsbcwmfrq4rvqq1ipsskzwlgigwynxzn" }, "stable": { "version": [ @@ -69721,15 +70044,15 @@ "repo": "phillord/lentic-server", "unstable": { "version": [ - 20160717, - 2052 + 20240315, + 144 ], "deps": [ "lentic", "web-server" ], - "commit": "8e809fafbb27a98f815b544d9d9ee15843eb6a36", - "sha256": "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww" + "commit": "732b88e7a183707ba65c38e8b3517cac42572644", + "sha256": "0r5n1xm21y1xi3pm6x107l9njcgh5207vc4imwgk4xh5axblmcfl" } }, { @@ -69831,20 +70154,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20231108, - 1108 + 20240304, + 1034 ], - "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", - "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" + "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", + "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" }, "stable": { "version": [ 1, - 1, - 8 + 2, + 0 ], - "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", - "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" + "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", + "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" } }, { @@ -70851,14 +71174,14 @@ "repo": "Fuco1/litable", "unstable": { "version": [ - 20221028, - 1640 + 20240321, + 2059 ], "deps": [ "dash" ], - "commit": "0a75befedbf826c9779f83500792b044658f2374", - "sha256": "14612mv4m8zrh0skshnbcl47dvd9ih2jn80svyyq3hg7dxvmh5wg" + "commit": "b83b1283ea6642ab82f536f1f3b280160404ff6b", + "sha256": "09jk7316vi5v6bsp0dc515x2j1kpvww4j6v5ry3dwqaifr7gi78b" } }, { @@ -71107,11 +71430,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20231219, - 314 + 20240304, + 1642 ], - "commit": "a7529311e9a60b26b562a98f00feeb09ef640afe", - "sha256": "0qvzky3bihgimym84k14gd8fa57cgvqq8y7wsic6kjdhqq3qchhf" + "commit": "eafd9848fe6eeea14373c6969c3bd9e5e0838fe2", + "sha256": "0qzrv3m7drigvfzg7f5w26aksqy5nk47s8mzhrs3dlg9597xdkn0" }, "stable": { "version": [ @@ -71221,14 +71544,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240101, - 2218 - ], - "deps": [ - "seq" + 20240312, + 1636 ], - "commit": "05c14ca9bcc63f4afa27fc18df1c32ab63b8ed7b", - "sha256": "1a4b2whjv1lnnz1wmqj9g0l2hk41rgi9njqmjssgwlf3484bcq79" + "commit": "e73736d3bd3a8284a2d48266a0cfdb0c9b9217e4", + "sha256": "0f3ysf9rpy1pkg9czl8lblp97l1prv7qb6jsgs206mwbyg1lar15" }, "stable": { "version": [ @@ -71801,29 +72121,30 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240220, - 114 + 20240310, + 50 ], "deps": [ "compat", "map", "seq" ], - "commit": "fc0296ca155c32ad3455f36602b7b34f2163bfd7", - "sha256": "0pk9vp28mdcwbycj2bdqagzjadl3xavsvl86xmil8g15hkym4m1r" + "commit": "de9a2933f4794d13236236db6165403d722e5105", + "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv" }, "stable": { "version": [ 0, - 11, - 0 + 12, + 1 ], "deps": [ + "compat", "map", "seq" ], - "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", - "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" + "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", + "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" } }, { @@ -71834,28 +72155,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240220, - 114 + 20240225, + 1740 ], "deps": [ "dash", "loopy" ], - "commit": "fc0296ca155c32ad3455f36602b7b34f2163bfd7", - "sha256": "0pk9vp28mdcwbycj2bdqagzjadl3xavsvl86xmil8g15hkym4m1r" + "commit": "eeebd2713d636b3cf08c6af22f46d23b9aa06592", + "sha256": "104vwcxcypib6w8706x27szdc2a40mcbz7kakkpk8qhvg5an6gq3" }, "stable": { "version": [ 0, - 11, - 0 + 12, + 1 ], "deps": [ "dash", "loopy" ], - "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", - "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" + "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", + "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" } }, { @@ -71985,8 +72306,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20231121, - 1644 + 20240318, + 2039 ], "deps": [ "dash", @@ -71996,8 +72317,8 @@ "s", "yaml" ], - "commit": "60e1103ac7c8e30d036ea65fad489210682d6259", - "sha256": "1y3x2p0f7c2igg9cckk2g5x5cpypa9f2iyfi9ai0hdx60n7gkmrm" + "commit": "5554349883af05fd25d6bbd56d7116d7f965d493", + "sha256": "1ybcnha6kbqcx7jrm666jbrnw5hkbws7n541zl2d4jl1gpv09g5y" } }, { @@ -72040,8 +72361,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20240101, - 847 + 20240229, + 115 ], "deps": [ "grammarly", @@ -72050,8 +72371,8 @@ "request", "s" ], - "commit": "7b3597e19c50452124f532c3c47f40c0e33f6e91", - "sha256": "1xxyyfpn8dnqciypl826k6nimsjng1cyy68i8fypcvay88001qdp" + "commit": "39deb23b282785eaffc6ae17838c92c613a49315", + "sha256": "0f2kj2d64b9rqz9jf38629b5hwvp7wscbc646ydfmwib5f2m723x" }, "stable": { "version": [ @@ -72273,28 +72594,28 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20240215, - 1159 + 20240324, + 1218 ], "deps": [ "consult", "lsp-mode" ], - "commit": "11935eb414b1ef81af2dd34d11e79c5490cd67f3", - "sha256": "0gr5v9cbhiqwp8hs8di5dlc6gq2ka26bi9fljldl1421yxsxyl0m" + "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", + "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" }, "stable": { "version": [ 3, - 6, + 7, 1 ], "deps": [ "consult", "lsp-mode" ], - "commit": "11935eb414b1ef81af2dd34d11e79c5490cd67f3", - "sha256": "0gr5v9cbhiqwp8hs8di5dlc6gq2ka26bi9fljldl1421yxsxyl0m" + "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", + "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" } }, { @@ -72305,14 +72626,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20240101, - 851 + 20240318, + 224 ], "deps": [ "lsp-mode" ], - "commit": "ef649bfaeea2931ef41d7c27b819ea9c41b6fba6", - "sha256": "0841jbz2aiwzi5agwrj819wx2v5ml1fgbwgsdnn8z9c9l5gcrvk2" + "commit": "c4bc1515be815b58d76bed2dbc5e7c400c37d6be", + "sha256": "0n2vgwag68wsszmjid0zz0jip7nb03chs3v1vh0zm15y0ri0rjl3" }, "stable": { "version": [ @@ -72382,8 +72703,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240222, - 1726 + 20240324, + 1820 ], "deps": [ "dash", @@ -72394,8 +72715,8 @@ "markdown-mode", "spinner" ], - "commit": "9d3ff6faaf4c0273640df1e989abd6613736870d", - "sha256": "1p1vvpp9zqxqhrw2iidxw1r5pzjbm8c550yjnb0syyppkvx4rj7s" + "commit": "17e583c253e0cba71ee8a0c25743933c478d5c62", + "sha256": "168dpcmjvv590awqzlv5hfc2lpwx1nwn830cqy55nnds4gvmp23s" }, "stable": { "version": [ @@ -72657,14 +72978,14 @@ "repo": "shader-ls/lsp-shader", "unstable": { "version": [ - 20240101, - 952 + 20240229, + 111 ], "deps": [ "lsp-mode" ], - "commit": "65b90c66222043dfed07e193670eb8e9e9a396b5", - "sha256": "1kvp5bbq8xs4mqs991zqrrbn7hilnmy6fbykzh6ck9smrw80r77r" + "commit": "02fdc6d74e931db52ba1aa8dcce17d0a26049242", + "sha256": "1ky5rds4mvfnpibp4n9zmlczlccncwjhz4ylrzs39d2rlfw953qn" }, "stable": { "version": [ @@ -73088,14 +73409,14 @@ "repo": "phillord/m-buffer-el", "unstable": { "version": [ - 20220719, - 1850 + 20240302, + 2255 ], "deps": [ "seq" ], - "commit": "d2e35bf9293367f1a2d19f259f32a35bd9f4788b", - "sha256": "0b961hwyrbabrf732859aqbi3n9s237cx7j96baq9yf2azi6a9fb" + "commit": "8a51de3366599e7fa52e37b596c9ce226b6f04c5", + "sha256": "1v632j4c2k8ram18ayaq64rf01y102a40rh9mvrzzvmf2jkmcw6p" }, "stable": { "version": [ @@ -73165,14 +73486,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20240113, - 1224 + 20240321, + 2352 ], "deps": [ "transient" ], - "commit": "75604bb57040be06eabf41669e6e2553afa8f7ba", - "sha256": "1vkis7ahl08n9xfdisf2w2p0aih3jmb1apcccsaqy5b7bn9dc381" + "commit": "a5ef9d69ff04f5dc62c5a48c5119d96ab3e4d62a", + "sha256": "1qwpj4qmq31270r0n17dfkwskxcyd5ysg78f2yggb9zfk5vvdn1d" } }, { @@ -73206,14 +73527,14 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20230813, - 2123 + 20240320, + 2226 ], "deps": [ "cl-lib" ], - "commit": "0b04a89f698c335c9ea492553470a8d45c113edd", - "sha256": "1735wqjb1n5q0pckh2sch2vqr7z2ycl6ns4rr5q3wvf5njpb22sv" + "commit": "b56965e66c82b529ac752fa2abe6ffa3a1dbef58", + "sha256": "1d3xnbmg6vz42y9327kapd14f4khnm1ii4bbskcwpimirnr9bnk0" }, "stable": { "version": [ @@ -73349,13 +73670,13 @@ "version": [ 0, 3, - 0 + 1 ], "deps": [ "compat" ], - "commit": "688451a7616032a6c1a98ec627860e1d4257814b", - "sha256": "0bcp4vlhw2nvqfb4rl4iq05hghqwandkbvyp36992jnm9r7l149a" + "commit": "6ac83927a6c294619bb99cb1ceb2ecf352498599", + "sha256": "0x70dd12w0p44c7b5273fwi51sr2giqcl230170v8vk9rn73p12i" } }, { @@ -73366,8 +73687,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240218, - 530 + 20240320, + 2336 ], "deps": [ "compat", @@ -73378,8 +73699,8 @@ "transient", "with-editor" ], - "commit": "f5ddce8c8459ffcbb2bd3ae759259d6b627c69cd", - "sha256": "0r3x70rhnacs4yd8kh58bqgs6mha294j22vmwk9jzwhfxqwy63v8" + "commit": "0e8f25a8d8011328f2bf082232c720b24c2a12c2", + "sha256": "0x8qqfpxl1mr8s3q8z38bfng4raxkhnr7djymyagisbblnbxr9zj" }, "stable": { "version": [ @@ -73648,6 +73969,26 @@ } }, { + "ename": "magit-gptcommit", + "commit": "674e68c28ee0e12e6f2b217b7d140eae22473d16", + "sha256": "1mrygbjhha0kyl7jydhc3ycmmq6wpp6kb4sw7gjzbikw3vhqhgba", + "fetcher": "github", + "repo": "douo/magit-gptcommit", + "unstable": { + "version": [ + 20240303, + 1649 + ], + "deps": [ + "dash", + "gptel", + "magit" + ], + "commit": "28485542a14966141208daf6baedb3833ad2357d", + "sha256": "0wl1hccwalrm585kv5jin8975jmymff9xl8jw6rnw1bdrn59a4wl" + } + }, + { "ename": "magit-imerge", "commit": "e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c", "sha256": "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4", @@ -73869,15 +74210,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240221, - 1835 + 20240311, + 1407 ], "deps": [ "compat", "dash" ], - "commit": "039a1801efd2c75412de65d7b6a36e39361938af", - "sha256": "1cmb6glxzvvngycvxlp0vxbdxprxa5kh3f0yk4ydx9pzbbwdkspa" + "commit": "8a3c1ccdda8185255ce76adc2ba41b9a43f18b8c", + "sha256": "11srw91xq20cv0zd41cvb4pi5x4hdxphsq5y7p8cpxfkvxzvh0nq" }, "stable": { "version": [ @@ -74009,8 +74350,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20240213, - 1759 + 20240321, + 759 ], "deps": [ "async", @@ -74022,14 +74363,14 @@ "s", "transient" ], - "commit": "1e9acc0ba63fbc297001bf334d63cb4326be80df", - "sha256": "0jh4ii4hbyq5rhkrq17y2wddl20d8xzixwix1p3pigvby4qv30ij" + "commit": "332ce763f7336ea356964b92723678aa1ed4640f", + "sha256": "0npqns8fy0brxp8mcxbzf7n0ssrz0gb0h8ggqdfc0csal1bjs283" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ "async", @@ -74041,8 +74382,8 @@ "s", "transient" ], - "commit": "a2396aaead5bc7712278260f245c740195c4afd2", - "sha256": "1y5l36ig0q5dqgijw916zgaz68kphg7k6kxs560vrfwkfn0cy59d" + "commit": "a9f47dd8ad81b96be866bccd6c99358525408b4e", + "sha256": "1ygn1498ji785bkbi7ziazk1bkzinq5srpjh2yhw70v3cr5sfk8g" } }, { @@ -74697,14 +75038,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240105, - 701 + 20240323, + 2015 ], "deps": [ "compat" ], - "commit": "ea356ebb1ddb8d6da78574b517155475cf52d46f", - "sha256": "15zq9071f1dd6a26x4y51yk9l5rkwb3vnm6qa7z8gvhhj15n8glb" + "commit": "3275d1f85cb020280979a050054b843f7563aea2", + "sha256": "0lljik22flx6khc26xyk8qr91p883mgh29fl8rnyyvdlljlsj33a" }, "stable": { "version": [ @@ -74839,11 +75180,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240107, - 831 + 20240318, + 1307 ], - "commit": "e096bb97a91fcd4dc2b46d8b6e093194b03b7364", - "sha256": "1bzinzr94637kl8aqk2jxmhj57jabq5xjs8fqnmi39an2nv98bh0" + "commit": "fd6c5508f979ab526e024a591eaec963712cb211", + "sha256": "15vip2y7lgypnipyabrq1qlqwg6s3365gsfij3bipxbnx2p9n1p1" }, "stable": { "version": [ @@ -75169,28 +75510,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240223, - 1703 + 20240309, + 1753 ], "deps": [ "persist", "request" ], - "commit": "25bae1042ff59efa516d6443a729453dc023dd11", - "sha256": "03x7r2hcd4m6xq21yignm04c9g4l732bs9cbig46k5rhvqsk7nnj" + "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", + "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" }, "stable": { "version": [ 1, 0, - 16 + 18 ], "deps": [ "persist", "request" ], - "commit": "25bae1042ff59efa516d6443a729453dc023dd11", - "sha256": "03x7r2hcd4m6xq21yignm04c9g4l732bs9cbig46k5rhvqsk7nnj" + "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", + "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" } }, { @@ -75443,11 +75784,11 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20230811, - 442 + 20240229, + 730 ], - "commit": "a9f1e8ab46858c35a600ce304748a7db65400bef", - "sha256": "1bihsi0qlvkz817jbbw3352rvmb9iy73l4m9gqr33ca3sxs6qavq" + "commit": "13517d8bee3001d6208ad5255237880f19d4f1e5", + "sha256": "1rnrx8l91f96k719zkjxnz3hr6wasl6x5m4kkkhzk3iqgvvpsnys" }, "stable": { "version": [ @@ -75905,11 +76246,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240210, - 1644 + 20240321, + 931 ], - "commit": "54d4e933039827c158a4f593a94681a64e0d8042", - "sha256": "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq" + "commit": "59c058c3ccf55badda65d55a56aa30cd025441c7", + "sha256": "1wx6p4a7p8rl8hp3ylcw7z9cjrvyxi66lkn4wb4khvlz45c75f0n" }, "stable": { "version": [ @@ -76387,11 +76728,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20230415, - 633 + 20240305, + 27 ], - "commit": "47886a3b6bc64e5822546318e5a3dd0ff5eeb967", - "sha256": "0avzxdlj027pyfs3is8kj4kwgyrl2b6r2n7a0pcbag09f71f8nhi" + "commit": "d41dc93785d231f1e391ba61893aacd1331d5726", + "sha256": "1amz0d27xik7zx3mkfr08v5izjvqiabw08x6yzlw60hjx9pafzzl" }, "stable": { "version": [ @@ -76457,11 +76798,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20240122, - 2052 + 20240305, + 605 ], - "commit": "a8f194259bd36e63410f972b210542fa0cfb67ce", - "sha256": "1g9mm5i0z8q0abpw1ji9bsjydylxrws39qy5ncbqhqjdvbards7j" + "commit": "90f6d4e5630ab69d737fdf7f17c81843a9c6a081", + "sha256": "0a9w5mg5jfbjvkljmqrn1jicfffc888g1ngdipqqvq85hfpcdz44" }, "stable": { "version": [ @@ -76481,26 +76822,26 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20240206, - 1129 + 20240311, + 1117 ], "deps": [ "calfw" ], - "commit": "244cc9089a95b83200c4121b235448dc6d3730cd", - "sha256": "0rd5dxqhzyki60vlnf10mhf3nqhq9inh56m4k92lp4865xsds7pp" + "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", + "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" }, "stable": { "version": [ 1, 2, - 4 + 6 ], "deps": [ "calfw" ], - "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed", - "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp" + "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", + "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" } }, { @@ -76702,20 +77043,26 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240220, - 1934 + 20240311, + 2001 ], - "commit": "f25a2f543b3e9fa5043ef37c81c17fc15aceb534", - "sha256": "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx" + "deps": [ + "hide-mode-line" + ], + "commit": "9b3fd955e04ec168fa769a79cb9f480e84f90ffd", + "sha256": "1dw1l3w9y9p0128ywazlglbbxmsmzhngj1q1x640k174vlwx48hg" }, "stable": { "version": [ 0, - 7, - 2 + 8, + 0 + ], + "deps": [ + "hide-mode-line" ], - "commit": "f25a2f543b3e9fa5043ef37c81c17fc15aceb534", - "sha256": "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx" + "commit": "9e01966d56514aa1fe9b7cc281da390ab33532d1", + "sha256": "0q4hvbypnjg5q1szwki2md45r5kkdxrr4zxqh57y7d53idjzhpnf" } }, { @@ -77415,20 +77762,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20231028, - 1648 + 20240302, + 12 ], - "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", - "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" + "commit": "0d8f8941f3e31a19641db4b21dd7d963c514ec92", + "sha256": "0vylps3x6jqfy8la1hq3969qms2pcmrcg8dnsbbydinngvh46szn" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", - "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" + "commit": "f372a5759e40b79bb4868d12209a5eb7dc661a54", + "sha256": "0kiksf8kax0l33aqag9igmwkm0yccmijzji4ff2bcil2dmxcj47r" } }, { @@ -77690,20 +78037,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240223, - 712 + 20240322, + 519 ], - "commit": "5d57c7354bec2d62e4c962ab47101bd604aea438", - "sha256": "00km2b9zab5l109w0qf3qak4r5a8fr3wych7wkfk2d2ljs8brz4c" + "commit": "bea2f68833e1f46ef60eba25f67a8ab162e7bccb", + "sha256": "1h4wzarzgk06v14xxsya0fym4bd17vgmkw3skd8sc81bak2fb74d" }, "stable": { "version": [ 4, - 3, + 4, 0 ], - "commit": "fe08a02c4c0501a984b15af3f8c3c5e4769b93ad", - "sha256": "12i32y7y6hcv7mqc6g7pcmxr2f54xf3vl2yavdv76643vlhay32v" + "commit": "a082d7739f627523c6d9098c869cf143fa60b014", + "sha256": "1vy6wyq8hv8fih4m8m1k9n7fdp913nmv0k5g8vppnjivmnrwfswy" } }, { @@ -77714,11 +78061,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20231006, - 639 + 20240308, + 921 ], - "commit": "1872aebc016e1c1a8d4e2a4037cd54b618de5453", - "sha256": "04hipaz7wc46axnjqgbwzcjghiyw9fc6kslifs3263h96cfxib0m" + "commit": "56286c6b869520807596e3e8af1b37c50e5a1349", + "sha256": "122zn5hvpc56cg6c8h6j9v2cqimzrqlrr49glqfw9wix648xapzm" }, "stable": { "version": [ @@ -77941,11 +78288,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20220117, - 1244 + 20240324, + 1830 ], - "commit": "4a09c59f948ba5b602b6f395e667f53224fd75a2", - "sha256": "16ykswl0nxhva6njidz6scgnp5g7rr40zvscy060f09jqasbwxwq" + "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e", + "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk" }, "stable": { "version": [ @@ -78052,14 +78399,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240102, - 1542 + 20240311, + 1617 ], "deps": [ "compat" ], - "commit": "622a5316cdced84dbd0559443bb86bb635692a0a", - "sha256": "11hxzz1yc63yx7pfcn18b7fffajfc494ci2x4dcxnzw84qzssds2" + "commit": "65116ee9a8d8ca5a9e1e579b5957e0e7673c1dfe", + "sha256": "196r6nwfjj0gj1b356gb0snqq4iqkv0k35nd17mmg48qdl517n4v" }, "stable": { "version": [ @@ -78352,19 +78699,20 @@ "repo": "amnn/move-mode", "unstable": { "version": [ - 20221205, - 1433 + 20240309, + 2223 ], - "commit": "fa34fbe977d62c8297abc3547b9cfb25802e033c", - "sha256": "1qxnkdvn0d2ybrkwm57wn0k5y1nr6sc82i9n3s2306anyflvn868" + "commit": "b07983c8df12fa428117cea8e09067ae952871d9", + "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], - "commit": "87aabaac939b69bfd4cd23704e3b67f59c461358", - "sha256": "0sdb783i0rg1fgcs38xxn59z7mzkc43m9cgdx9vzb2ymzzfgg0z9" + "commit": "b07983c8df12fa428117cea8e09067ae952871d9", + "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" } }, { @@ -78423,21 +78771,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20231026, - 1200 + 20240209, + 1327 ], - "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", - "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" + "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", + "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" }, "stable": { "version": [ 2, 29, - 5268, + 5374, 102 ], - "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", - "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" + "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", + "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" } }, { @@ -78707,14 +79055,14 @@ "repo": "lorniu/mpvi", "unstable": { "version": [ - 20230608, - 154 + 20240315, + 214 ], "deps": [ "emms" ], - "commit": "f633510686d7b974147592336fa21ce6df80a5da", - "sha256": "03rjdarf7c6yl9pcgn1b27kc6699k1xhysf6hw6npgjn33iafllw" + "commit": "2412e4cd2879e1ebeaf29b92104abc94226b50bc", + "sha256": "19h35qzr7n4rza1phmk67p5ri747sl1smnp7pzayidibcvhcynvc" } }, { @@ -78908,11 +79256,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20221213, - 2206 + 20240318, + 2050 ], - "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", - "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" + "commit": "d0387f277c1572160b3e80471252ff0305409988", + "sha256": "0xcbbinhh6r7larg3r3mgid1f2lf49z0hq1hy2ri3wj8zld6iyl3" }, "stable": { "version": [ @@ -79899,11 +80247,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240218, - 715 + 20240324, + 1932 ], - "commit": "a4c1d5bef93d9382ecf967a9897796e7a8937484", - "sha256": "1xkhqmfpb4sc1glx5ly9hwjpicdiq94cfbi9qsb43fx5xqc38d3a" + "commit": "7cef2b6097bb73a6a293a81a0f1fca1e9893321c", + "sha256": "13xrpd13rxv5zp4w1hgyayyjxa0ap7g505yrhdq8sfirlsfic57g" } }, { @@ -80601,11 +80949,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240122, - 644 + 20240319, + 833 ], - "commit": "c6a4acf19454b415cba1c43daf4bfca8fccdd9ba", - "sha256": "1pnlp54f0c2wgc65p932xyk71lyw361x17w71fnxgp72j1a3y6dz" + "commit": "8095215a503d8048739de8b4ea4066598edb8cbb", + "sha256": "1zwhslj2r63dmwgbv031b63rhhghf2nv8wb9zx31rdqh96g53s28" }, "stable": { "version": [ @@ -81627,9 +81975,9 @@ }, { "ename": "no-clown-fiesta-theme", - "commit": "3004633d97d78a997b4e904b36dc13f87df1503f", - "sha256": "0cvg8ldnn90sqdkrk64im42kbr6f3z3zk9skbda9v530l456m38l", - "fetcher": "github", + "commit": "7e4b0a546f6e2038369a816936e3a80436e3bc86", + "sha256": "0rf411gx8ci4kyhp86njjh41pvhr0pjzxwpg6nhhkq9aq3smyyan", + "fetcher": "codeberg", "repo": "ranmaru22/no-clown-fiesta-theme.el", "unstable": { "version": [ @@ -81666,14 +82014,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240217, - 1926 + 20240321, + 710 ], "deps": [ "compat" ], - "commit": "6de0be803206334bfff5b74cdccab5ed51b37280", - "sha256": "0frxyyq7rr13m3jdzczr185wphrfxylgfriqagchpqnby386bzpr" + "commit": "dcc7af41cc6b48d446c0a76bae029898f82cc2e3", + "sha256": "103cmw2cxbq9n4csh0n3rrq57caa1fdby7ry0izcdnaaph7rwhqc" }, "stable": { "version": [ @@ -81711,16 +82059,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20230904, - 1815 + 20240317, + 2321 ], "deps": [ "kv", "request", "s" ], - "commit": "04da1d3467d08cd1d28539c2b132035a9fb1c793", - "sha256": "19rqq2j367yvxdfrrkflicp1p7swf23kxya82kpb84zd7z1vn85z" + "commit": "7d68b5a580c64123f3bbd75f795a891dfdeb1746", + "sha256": "124ak5qvjlg3kb49wmx8pbvdpqz6g79ji811kjvxf9d5gbv85714" } }, { @@ -81985,17 +82333,17 @@ }, { "ename": "nordic-night-theme", - "commit": "11254a9e0d387eb6a50a0a9cc09dccc7f667115d", - "sha256": "0wbpw6344ncpv2d578g7wqr1fvn057ryl3sp3mg9wpah36fi5g0v", - "fetcher": "git", - "url": "https://git.sr.ht/~ashton314/nordic-night", + "commit": "f1985ff02a9d7ec22fc9398fac5d91a3f32eb368", + "sha256": "1gihwfp9shpdvf340f0h69qnaswfhd0jpm1x3acn5v0b8jqns5ay", + "fetcher": "codeberg", + "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20231205, - 1744 + 20240311, + 2147 ], - "commit": "d5d481a6b514001b22d1a184c1214d220fe3869d", - "sha256": "1qvka1ybwc3jyxjk0ljzmbf6l56lmfqi4l7dasmmc31w7all3l53" + "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b", + "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss" }, "stable": { "version": [ @@ -82122,10 +82470,10 @@ "version": [ 0, 38, - 2 + 3 ], - "commit": "c769658360e10a6d01a4134e680e2f498741bc5c", - "sha256": "07n4cp8zql9vkc5s18d687mwhb96cad629d3mgvxbf36v3v1s1xx" + "commit": "d0469c5b4c6ed9188b96b12363fced45291813fd", + "sha256": "0y9fmd8qaybs3i6xndsmq9f5iskdc852i2bq442k7iyjgj3gw8rd" } }, { @@ -82260,16 +82608,16 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240106, - 1322 + 20240302, + 2332 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "0dc26288276e43a2e362acae850444a47b7db652", - "sha256": "05kwrnmj3d4rhx463iilfs6qwqy7f1rg752ghcmjlx2l1vjqwsc1" + "commit": "f08ef922b88d90a7cad348743c8470f443b1fa8e", + "sha256": "1v20cz1kkd0p82hrdkq7wy30wgi37idrzcxk3n23ypmhmylig82a" }, "stable": { "version": [ @@ -83121,19 +83469,19 @@ "repo": "TxGVNN/ob-compile", "unstable": { "version": [ - 20220830, + 20240324, 315 ], - "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", - "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" + "commit": "2b614d108445b8462b491af09092b0f65c237e42", + "sha256": "1246ji8kx5hznwbb55fvi446gsjbd0znwd2zjv6ygxsp4lcbrsib" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", - "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" + "commit": "ee94c0d432b98d4b003b179e2109c3114ea54d9b", + "sha256": "06zkjnv324bwj1bd2kdvxar0is992qngl5n94d4z2cpx3zcn2c5q" } }, { @@ -83983,14 +84331,14 @@ "repo": "jackkamm/ob-reticulate", "unstable": { "version": [ - 20210214, - 2229 + 20240224, + 1615 ], "deps": [ "org" ], - "commit": "56f4d74f5a2218927aeacce61442b373a0a189e3", - "sha256": "1r93i00g79jclfcpd6rla7c80rm30avmi66fc1z0qqyfpf29kvy0" + "commit": "dc08d43df967b15446f3d229fdc6bd600b7ea0df", + "sha256": "0sa1y4n51kvq6i3y79dbsx703gmir7k7idj84pbr9fp9qfjal45i" } }, { @@ -84412,11 +84760,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20231111, - 1100 + 20240320, + 1152 ], - "commit": "f8e3e1cb02f83624624a4e42070059d91f2e8d5c", - "sha256": "0mb5mmw1110a4czg459c4dl6xj99vzp5vgkhp7kkdgakck0pz17z" + "commit": "8b7ed6627ee3c838acd2ec9bfd5a6fb02228edfb", + "sha256": "1qp8216c6spjyjbnj0x3w150fisnxzy5yzhgkihip352kf5ah54j" } }, { @@ -84712,26 +85060,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240104, - 1513 + 20240319, + 1005 ], "deps": [ "org-re-reveal" ], - "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", - "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" + "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", + "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" }, "stable": { "version": [ 4, - 19, - 1 + 22, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", - "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" + "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", + "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" } }, { @@ -85611,19 +85959,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240221, - 1601 + 20240320, + 1638 ], - "commit": "91df48c8e1331e434ce6ce3bab709de2035e3ec4", - "sha256": "1frpidiv3pl5l5nh0n1k7yhkbhk2hqsbnpdv63jdn767w8s3pwa2" + "commit": "3847f311077efa17951a786d2759f2639c5f43c8", + "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "847694e78c12d903d5e3f6cb365a5d3b984db537", - "sha256": "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4" + "commit": "3847f311077efa17951a786d2759f2639c5f43c8", + "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" } }, { @@ -85853,30 +86201,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20240105, - 1423 + 20240311, + 2016 ], "deps": [ "dash", "promise", "request" ], - "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", - "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" + "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", + "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" }, "stable": { "version": [ 3, 2, - 4 + 5 ], "deps": [ "dash", "promise", "request" ], - "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", - "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" + "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", + "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" } }, { @@ -86280,20 +86628,31 @@ }, { "ename": "org-caldav", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc", + "commit": "9b189a0fc43987c9975d27da5049001feccf68a7", + "sha256": "01ravi768xn62r4l0xcsr3k049m93zhdw7fn0gsiwjmqyvzz5l7m", "fetcher": "github", "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240221, - 704 + 20240302, + 2226 + ], + "deps": [ + "org" + ], + "commit": "21da50c95b279b5fa528b353181275f935de1e1d", + "sha256": "1rmd2d0w6f28cgdp4vibs4h2nz69i25s0s4x7vwhfjx8393bmyc0" + }, + "stable": { + "version": [ + 3, + 1 ], "deps": [ "org" ], - "commit": "9a3062cea3d1081450abbbef6a0d2b83014f31fb", - "sha256": "09vhpbbyxnip0rb3467an227w9xacg6amcfv75bqlyyj7c8lh675" + "commit": "7c0ae0dd84d47f7f28a5e74e68ecbbd53df401d8", + "sha256": "0im6swyhdy8g56lh2nnbz7hb4hjqspi7aag7qc4616m5fs7ijlig" } }, { @@ -86364,14 +86723,14 @@ "repo": "drghirlanda/org-change", "unstable": { "version": [ - 20231026, - 2216 + 20240318, + 2003 ], "deps": [ "org" ], - "commit": "c74662112e8a857bd87c54128baba9307a393974", - "sha256": "0mpsghnzgyhxzjdsnj57sizv0dny75hm0kj61q13ckrc26bjlhg7" + "commit": "e944bb4a0943cdd06abd9032e6e6cbd34424ea42", + "sha256": "0gpdrli91rmjvngvddmivq41by60jiha7xmxidsr0lq961q1nrvi" } }, { @@ -86432,39 +86791,6 @@ } }, { - "ename": "org-cite-sidecar", - "commit": "78a825b6589e3d1264a2134c11fdf836ea75e348", - "sha256": "0ifdlfk6zqv6ajl0hsc0vhll5pf496n7za65vnvpfrmbkz1g9j6y", - "fetcher": "sourcehut", - "repo": "swflint/emacs-universal-sidecar", - "unstable": { - "version": [ - 20240218, - 1917 - ], - "deps": [ - "citeproc", - "universal-sidecar", - "universal-sidecar-citeproc" - ], - "commit": "94e349534e049c9bcf08eb70ef4ebfc9b9f80d0d", - "sha256": "0yh682yv8236458070v56g7p1c7ana87whyp9kz1k7nwjr6z9vil" - }, - "stable": { - "version": [ - 1, - 5, - 2 - ], - "deps": [ - "citeproc", - "universal-sidecar" - ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" - } - }, - { "ename": "org-cliplink", "commit": "7ddb13c59441fdf4eb1ba3816e147279dea7d429", "sha256": "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p", @@ -86480,6 +86806,24 @@ } }, { + "ename": "org-clock-agenda-daytime-mode", + "commit": "d86e8d1a1afba41d3ac684d998e1bdf206fa5459", + "sha256": "0xmaimwfyih2yfh6qimhhjwrpkqmvlc0694qpkb2vg6338sm41si", + "fetcher": "github", + "repo": "ArneBab/emacs-org-clock-daytime", + "unstable": { + "version": [ + 20240303, + 846 + ], + "deps": [ + "org" + ], + "commit": "82e2cd5a523f5fda75176a08eb120a0872700add", + "sha256": "1xbhigbb7r1cfp0f63bg3k6x9kqbxffjvykfvj84llgjzqjns6rg" + } + }, + { "ename": "org-clock-convenience", "commit": "a80ed929181cdd28886ca598a0c387a31d239b2e", "sha256": "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw", @@ -86613,14 +86957,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240220, - 536 + 20240311, + 850 ], "deps": [ "org" ], - "commit": "fe2ca7d35c439f64742234beba35ed4a3e196f70", - "sha256": "0jd12dcj3rirkgnmfz69pdijwwihdlv9441zb0yvrz4vi4z2n9ac" + "commit": "6660db078f7687af3bc31f702e3e957d4d7654bd", + "sha256": "0i0jkdn2wd7q9nzacaldhwx0i027951j0dp24pgkq34radqldjmb" } }, { @@ -87835,15 +88179,30 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20240223, - 1448 + 20240312, + 529 ], "deps": [ "fb2-reader", - "nerd-icons" + "nerd-icons", + "qrencode" + ], + "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", + "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" + }, + "stable": { + "version": [ + 1, + 2, + 3 + ], + "deps": [ + "fb2-reader", + "nerd-icons", + "qrencode" ], - "commit": "988f4b19f85340c6a7ba2a8c2c928833843957bc", - "sha256": "1b5dgjlg4w4x2b9j6zr1m0swxvngw0bn7n9wfwxq76vd6s52lr1m" + "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", + "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" } }, { @@ -87955,8 +88314,8 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20231206, - 101 + 20240229, + 724 ], "deps": [ "compat", @@ -87964,8 +88323,8 @@ "org", "s" ], - "commit": "412f211e8477c37f2e775e02341c43d42fe92bb9", - "sha256": "1f6l4g6dl4r9ylmrsnr2wja8bdr3635j8mlpih0lx5d8h5l11s8k" + "commit": "3ac2024694a9f974a7d263748642182fc7e829d1", + "sha256": "1ikvvrki9aw9pmai1qi92wipbjk1vka4qpac470714l8aq41zfbc" }, "stable": { "version": [ @@ -88084,25 +88443,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240102, - 329 + 20240316, + 1109 ], "deps": [ "compat" ], - "commit": "5f056aad428a0e4207012a0efa447aacb74c75b9", - "sha256": "1h3j58csbrzvz6fkabp97yrv0gpjrv7c6idlxplfb7qibjhg2lvp" + "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", + "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "d812a192f040a9e7785a53f144de1800d52b9f0d", - "sha256": "1nanv3rnrjldr2gd55hn2w8j4zcm6b9jq1qica3m7iyq187ygbdg" + "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", + "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" } }, { @@ -88183,14 +88542,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20240116, - 2218 + 20240319, + 1947 ], "deps": [ "htmlize" ], - "commit": "0b65f0f77a7a71881ddfce19a8cdc60465bda057", - "sha256": "0gv864k31fg2cf0ldl9js9f82h21pa6kjzvxn4kgnnbgpnwzin82" + "commit": "8ce92fecae371b7cfd5ef3c0a3ac280e5664487d", + "sha256": "1jcxj3cvi2lv46sgl8mwkzfc8kvlyvcvaxyq5i9mhbv8xfgvi6gx" } }, { @@ -88256,28 +88615,28 @@ "repo": "Zweihander-Main/org-newtab", "unstable": { "version": [ - 20240222, - 413 + 20240227, + 155 ], "deps": [ "async", "websocket" ], - "commit": "892a35cd853e8a83fc9b7645e7bb7c25838d220a", - "sha256": "07vf1lsh75jh9x483agrk69mbja7v0qyi1wi2q5xj3p3hi89j0iq" + "commit": "eca494a43e242558bd8db24d321ad62a8ec86c02", + "sha256": "0xl16f45kgmggknb7fphda67vzz67z72kqcqk22bxq7mjbav96kg" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "async", "websocket" ], - "commit": "892a35cd853e8a83fc9b7645e7bb7c25838d220a", - "sha256": "07vf1lsh75jh9x483agrk69mbja7v0qyi1wi2q5xj3p3hi89j0iq" + "commit": "eca494a43e242558bd8db24d321ad62a8ec86c02", + "sha256": "0xl16f45kgmggknb7fphda67vzz67z72kqcqk22bxq7mjbav96kg" } }, { @@ -88969,28 +89328,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240103, - 847 + 20240318, + 645 ], "deps": [ "htmlize", "org" ], - "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", - "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" + "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", + "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" }, "stable": { "version": [ 3, - 25, - 1 + 26, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", - "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" + "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", + "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" } }, { @@ -89148,8 +89507,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240220, - 1951 + 20240307, + 1757 ], "deps": [ "avy", @@ -89165,8 +89524,8 @@ "request", "s" ], - "commit": "fc6a933b64e127596d0dd61227f287ba545f6317", - "sha256": "0xiaa89y88dy3mw16zbnwgilx173nh3zpkrjrxinvl001qdvcbda" + "commit": "190248311f90cfc4f0cceef20c7bd52a5d5aa66f", + "sha256": "079lmfl2zm8pb0xlkansw9rbxrpn3dnmzwjajp2gma03b4gnw4v8" }, "stable": { "version": [ @@ -89289,11 +89648,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20240201, - 921 + 20240302, + 659 ], - "commit": "b623daf5c5a600d00057ac6351bad6ec8a1efc09", - "sha256": "10iwzl85yvkxfhf0l7shpb91rlkf41ha20sa99n2bsjxwyf9f8kn" + "commit": "50925a1183a51a6b3a9cf9ce23c425735e622e42", + "sha256": "1g6afgq5yb75j7v8sl5a5y2xnfhvkgk55lkykxix8ly11554x6dy" }, "stable": { "version": [ @@ -89350,15 +89709,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20230628, - 2036 + 20240229, + 1913 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "f90ac12b7ae5ba7bcdebfe53796fd0417946e5e1", - "sha256": "0magzl7bffwvjmri7r4smp6wdjcn8wgfgrd9sk5z0kcydd0r4aab" + "commit": "d9b8a57cfca832e3e7c7f414bf93060acbf63573", + "sha256": "1ww421apmn887602b9pddh76sd25x6jq3z1x0vah5zpglh2sqd6z" }, "stable": { "version": [ @@ -89382,8 +89741,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240212, - 202 + 20240226, + 1311 ], "deps": [ "magit-section", @@ -89392,8 +89751,8 @@ "s", "transient" ], - "commit": "9f5f1234a69b1df9d65ab947a003060fb5a28b60", - "sha256": "0jmdjf1mhbgnfncsgh3qiwss3hyn3yydc7gd0g0d42a8ac24svbh" + "commit": "2bd7c59ce1216b5d76e2a067be2f25807cd4d831", + "sha256": "05cjwqqsflw42mgz4ca1l73z35jwv3y1nlba4spwbsmp3p2nigls" }, "stable": { "version": [ @@ -89658,6 +90017,24 @@ } }, { + "ename": "org-sliced-images", + "commit": "52b6325143bebd4672e63cbeeb8b93ec63cc0df8", + "sha256": "0w7lm07cfbhrasxsn76l4g8fj4dnk7ryywwb194mnfkpmgfvjaq6", + "fetcher": "github", + "repo": "jcfk/org-sliced-images", + "unstable": { + "version": [ + 20240324, + 2009 + ], + "deps": [ + "org" + ], + "commit": "3a3d1704f82e909056294b3ac1da350dfea1ce30", + "sha256": "084anl78vq77i3j5jw0rq0cj383si0yp87d8z2amck6dg11gmn33" + } + }, + { "ename": "org-snooze", "commit": "fd04816fb53fe01fa9924ec928c1dd41f2219d6a", "sha256": "00iwjj249vzqnfvbmlzrjig1sfhzbpv9kcpz95i3ir1w1qhw5119", @@ -89877,8 +90254,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20231121, - 344 + 20240301, + 1602 ], "deps": [ "compat", @@ -89888,8 +90265,8 @@ "s", "ts" ], - "commit": "ee3379ae92b90c084717fb2a7614060ce12283cb", - "sha256": "1z8pwi03shgjcy7a31h758a25ikar0b3f8lscil4w9kii2v9222d" + "commit": "51c9da5ce7b791150758984bab469d2222516844", + "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4" }, "stable": { "version": [ @@ -90599,17 +90976,17 @@ }, { "ename": "org-vcard", - "commit": "df860814a09c376c9a6a2c5e7f528bbae29810b2", - "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl", + "commit": "cb46cf94b832a64776df16fc51c9bd5a848f1740", + "sha256": "07wbd1a75xr5cpw0v1pbvpd32lz3w2myl2dxjsn32a2zg349zgbz", "fetcher": "github", - "repo": "flexibeast/org-vcard", + "repo": "pinoaffe/org-vcard", "unstable": { "version": [ - 20221111, - 328 + 20240309, + 839 ], - "commit": "92345fa9f1e1f928278a654ac5ad57d22d74dbef", - "sha256": "1yd5ff89lss0dcnqkgmcb30bb719lixcad4pfkggpssnnix998rv" + "commit": "fab5ea81d8a4bb1123cdc0287b9b58c062d5b372", + "sha256": "1p0zx59m2839gpnizn7df1zw57s8i9c35xbw9fbqshbs8lv0ag4j" }, "stable": { "version": [ @@ -91323,11 +91700,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20230806, - 1657 + 20240228, + 720 ], - "commit": "7e158316ab43c92f6f41597e8646715870049abc", - "sha256": "07bs01ifdqixp725rwrkwb78777979dv4mcf4jh6qidhdaqf8zq3" + "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88", + "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92" } }, { @@ -91353,11 +91730,11 @@ "repo": "tbanel/orgtblfit", "unstable": { "version": [ - 20230110, - 1544 + 20240228, + 716 ], - "commit": "5bde4902187b2578dc39ee3a02cd7c84c4470b8a", - "sha256": "0hy6i6m38k3ad2yr22jrr5i3af9v3k0106bilqxklv8jv6i4x284" + "commit": "a22f3a137f3590d7f13c3be38bbd1e55d39cb2ad", + "sha256": "1mpfxvgjd7cgjdpndibbw2zcsnca8hckd0s25sfy0dbcvdsn6hb7" } }, { @@ -91368,11 +91745,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20230127, - 2133 + 20240228, + 719 ], - "commit": "257bd101a142aaad2fc3993f7752fe839d1663e0", - "sha256": "15f8zrzrpl967x7pq5833vclvrpj07n936gyhpslxlpd1shjnwg7" + "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d", + "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa" } }, { @@ -91615,14 +91992,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20240111, - 148 + 20240226, + 511 ], "deps": [ "cl-lib" ], - "commit": "1f5a74f3e5d7f3c443f07433951512cd99e820a6", - "sha256": "1nldsxm9m5m8kji9x8c0kjxknbw5y8y865cxbz9vpnxhlx7dj0l5" + "commit": "8f16ffb465b64c9dd566c8b7316b34896ce4c52b", + "sha256": "047y7zrih5d5x7m9i116yq951iyscb7ika1z4y864mqhd0ljhwvb" }, "stable": { "version": [ @@ -92138,14 +92515,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20220625, - 2321 + 20240316, + 1959 ], "deps": [ "org" ], - "commit": "a55ac6adef39124c9434be47fe9cc0c75c4bfea2", - "sha256": "1yz2nyq651wv82hccp04cqkikzj0jv5hvam48v0s9plynwlrc359" + "commit": "d6736852a5479c73c253d2ea8b352dcb232d02f8", + "sha256": "0sfc38p4jc6dxppmx1mxk7sni45jy6qq6220md4pnigsn8q6pr7k" } }, { @@ -92201,15 +92578,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20220117, - 1909 + 20240310, + 1513 ], "deps": [ "htmlize", "org" ], - "commit": "ff117cf3c619eef12eccc0ccbfa3f11adb73ea68", - "sha256": "0lwfpm5i5k1gaf0gmqjaxccisha4d7p6v8y9z9a510rc28a86vyb" + "commit": "a549cc8e1747beb6b7e567ffac27e31ba45cb8e8", + "sha256": "1i94p0nzhx1h181z6whkc3gbja85qk97xvmhx3p03a7b1pjswrhn" } }, { @@ -92350,14 +92727,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20221028, - 1631 + 20240305, + 1923 ], "deps": [ "tomelr" ], - "commit": "a66063a9915c859c57944564f0b8dbc7949d4449", - "sha256": "0yd7i1ryzc6lwmkfhkdh1kqqjyvzc1m0yyprm2m8xakkc12wljmd" + "commit": "c4156d9d383bf97853ba9e16271b7c4d5e697f49", + "sha256": "13bjhjgvpp1lr4m1wmcbka4wfi4ikvnix4rq9ryhdj679q176x7h" }, "stable": { "version": [ @@ -92374,10 +92751,10 @@ }, { "ename": "ox-impress-js", - "commit": "ec8cb06e00e79a36f614fb7d041ce1f8af3530ff", - "sha256": "116m86af5730k7c2lzxw3cz585n4zj09hcgr0g9r9shbhqd64xl7", + "commit": "b2fdd72363223f1433852e4cc982907a6d7dc32f", + "sha256": "0k8lhkq141rlrk6fjvy4yqvpzyjly49zdga3vyci44h0pfkpbmya", "fetcher": "github", - "repo": "takumikinjo/org-impress-js.el", + "repo": "emacsattic/org-impress-js", "unstable": { "version": [ 20150412, @@ -92544,11 +92921,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20230611, - 1229 + 20240319, + 2034 ], - "commit": "535f7228a845b69a9f70d81b30d304a2bf01cd3d", - "sha256": "15r140ivf5y593xv16yvf9hqp005fvka7wyfikk7s5baalali39i" + "commit": "eab473296b8319a052ca30d27e07508e876ca8d9", + "sha256": "007f3r38xnsg1b0srzx2qvcjbkdnkfh0mkhpa8fcph9wdnc4aj6z" }, "stable": { "version": [ @@ -92970,26 +93347,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20240201, - 2132 + 20240317, + 2053 ], "deps": [ "org" ], - "commit": "7bd86582afb7d8d504322dcba9848c478579990b", - "sha256": "0pyhbwsqsby52h740jvkrip1d78dkssymiyr31dnqzv3yg7qzj0k" + "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", + "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" }, "stable": { "version": [ 4, - 0, - 4 + 2, + 0 ], "deps": [ "org" ], - "commit": "a94de43da30e2a893b5d033747d79ff63bab743f", - "sha256": "15jfwrdawj8flgyfqhsfhdlnam6n5gzw5minnixwxyp69q5vxnpw" + "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", + "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" } }, { @@ -93154,6 +93531,21 @@ } }, { + "ename": "pacdiff", + "commit": "17da39dbf1df9e57d2e4a9d7a3c97e91f098a434", + "sha256": "06c9x70jbh662x1rjqami27l9rxlj9j5f0ny3zffyvjl428c6p6v", + "fetcher": "github", + "repo": "fbrosda/pacdiff.el", + "unstable": { + "version": [ + 20240219, + 1606 + ], + "commit": "74996064f7270a3b8fc57bbc8b166f3966c0a4c1", + "sha256": "1m58v63gi42j75l2zi2pjvipmbs1k040fmpy3msih7kwqhhvs54a" + } + }, + { "ename": "pacfiles-mode", "commit": "bec20443188d9218235c4b31840544a7b1e0690d", "sha256": "08yc3w7zvckg8s1g707hvbbkvi2k52jrk2iwlj0sk22ih3q3yaa9", @@ -93238,14 +93630,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240204, - 2043 + 20240306, + 2234 ], "deps": [ "compat" ], - "commit": "6ae02eddae6846d17ad6b13f036de35ee7d7f60b", - "sha256": "0k2z197f5q9iracmax4mrzw5x06clc8x615l0l9204xmd6bsms2k" + "commit": "236ef4e4d615699d4ba8b7ad28bd40b87d269411", + "sha256": "1s5ik92l3nz4k19l4a73p8y2pp4zx22w4iinj892kx5xakdh1s10" }, "stable": { "version": [ @@ -93280,27 +93672,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240220, - 2303 + 20240311, + 1058 ], "deps": [ "let-alist" ], - "commit": "eeb585eaceeba483d9bc7ab543e7422c82920e35", - "sha256": "0m257k7zl1fq56xpwq9pwl3ihahyd4235hmjq4p5k0b0f3bfbgdx" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" }, "stable": { "version": [ 0, - 21 + 22 ], "deps": [ - "cl-lib", - "compat", "let-alist" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" } }, { @@ -93311,25 +93701,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231113, - 1518 + 20240311, + 1058 ], "deps": [ "package-lint" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" }, "stable": { "version": [ 0, - 21 + 22 ], "deps": [ "package-lint" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" } }, { @@ -93474,11 +93864,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20240206, - 1156 + 20240311, + 1026 ], - "commit": "1b85352b0b16328d5c9e6a25baf93da3edaa6512", - "sha256": "1899dc4x9n07j98ciqf8rq0sh9791bnsf719b5fc3vqql93x57i5" + "commit": "e33426ae7f10c60253afe4850450902919fc87fd", + "sha256": "1mczwbr7yyk79xc68kamx9wrzbk6hhq6c7m793cx3qlxy80chn90" }, "stable": { "version": [ @@ -93687,15 +94077,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20231103, - 5 + 20240311, + 2218 ], "deps": [ "dash", "hydra" ], - "commit": "340da8787d6305640d042af46d2bd609bd5a7518", - "sha256": "1m3p6c1vjkdfpr1rjpb6rxxjrf9maa204fxpmjqnmn8mw7bfw944" + "commit": "c7fa568ab9cfbb2abfb9b22f419d28ce570d7b22", + "sha256": "00l4vh8mx899k330fvkplz77rg502j406gjc3v2nyakfmf67h85h" }, "stable": { "version": [ @@ -93994,20 +94384,20 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20230831, - 618 + 20240319, + 1546 ], - "commit": "6e6bdeeba32534acca5928fe4201ce013094988d", - "sha256": "1dkvsk3damvimnzs56f1vq4fqfkfkhwag9fzanz7s97bywpanhc2" + "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", + "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" }, "stable": { "version": [ 0, 8, - 3 + 5 ], - "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", - "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" + "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", + "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" } }, { @@ -94870,15 +95260,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20230611, - 239 + 20240317, + 848 ], "deps": [ "let-alist", "tablist" ], - "commit": "c69e7656a4678fe25afbd29f3503dd19ee7f9896", - "sha256": "02l1mwil0r8zgg3377i6zy8cz6kl48hncgyl8x6aigxrrqzsxvza" + "commit": "93e74924517d39483b432d6c3c9b8f8b8f0eb50c", + "sha256": "1js123pg2qbq5ql1hc7lwzrs4wqcdghsypvvwsm1qm9mi017g1h6" }, "stable": { "version": [ @@ -95558,19 +95948,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240221, - 1722 + 20240314, + 1247 ], - "commit": "3b4cef1a1fe57bd8ee32a0c58667d1fc8f802180", - "sha256": "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz" + "commit": "686dbe8cc7a94c65faf933695093645e53aa3318", + "sha256": "18v03ix5vg8a8w2ic5gik052p15d2mgnb112dvnxba69dyz6vsm3" }, "stable": { "version": [ 0, - 28 + 30 ], - "commit": "3b4cef1a1fe57bd8ee32a0c58667d1fc8f802180", - "sha256": "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz" + "commit": "bca35bd60fde1f561e21080768017f6727469d88", + "sha256": "1g04izsnvxinbwvzx0sj643ix5jlwdd7dkl61nvaqkkkm3g35jp6" } }, { @@ -98040,11 +98430,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20230909, - 56 + 20240325, + 10 ], - "commit": "3804068a5bece44184e044ca0cf1bcaec90f5690", - "sha256": "1v66vypgnb7h9c6ljz86md7p898qc2dfsb4nzka53an57sy5lvsp" + "commit": "c6b78fdd546e19582fa2195cf51f6753c45e7c03", + "sha256": "121qil7y3n4p601y2j2sk077d8vzyb5ghdpj0f618pbw6pp8gyk4" }, "stable": { "version": [ @@ -98663,19 +99053,19 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231205, - 137 + 20240226, + 204 ], - "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", - "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -99457,20 +99847,26 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20230808, - 314 + 20240321, + 340 ], - "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", - "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + "deps": [ + "project" + ], + "commit": "2db15b1dd88a92d51890ed1b6ab1007ec09c30a4", + "sha256": "1zapqprbfw99jv0kii1ajwlz9ix9d7w66lf8l67h7nzqls5pqi3j" }, "stable": { "version": [ 0, - 4, + 5, 1 ], - "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", - "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + "deps": [ + "project" + ], + "commit": "eab59faafc47763a7b9c4116bf8c438406f62705", + "sha256": "1k52zb6zmml5l50xkkhilml9ki06184mz2g865s4dp3vijpypqgh" } }, { @@ -99764,8 +100160,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240211, - 1526 + 20240317, + 1257 ], "deps": [ "compat", @@ -99773,8 +100169,8 @@ "project", "s" ], - "commit": "596b20a5f8690867336f4cb29368d0ac3af1a0fe", - "sha256": "1i4zjkhjsws8ppbknw4fc1m2355bda6h59lhjrwvccl2fakrbv3i" + "commit": "20548689eead0a86fcc921491047f392fd6b120f", + "sha256": "02ncfcbkwj933crrhca5wmfv55qpsc7szjvbdapkazzg5j4gqmlr" } }, { @@ -99785,15 +100181,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240211, - 1526 + 20240316, + 2222 ], "deps": [ "compile-multi", "projection" ], - "commit": "596b20a5f8690867336f4cb29368d0ac3af1a0fe", - "sha256": "1i4zjkhjsws8ppbknw4fc1m2355bda6h59lhjrwvccl2fakrbv3i" + "commit": "dc489480a6e4be82e570266202144730b3ddde5f", + "sha256": "198jlknm3za6n1wp1ns5vbw5554xfrdqdaayhrgqr3f8cil2y0vh" } }, { @@ -99979,11 +100375,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240223, - 1405 + 20240306, + 2002 ], - "commit": "1f0724813a4eacb59b7a8d8905619c893d12f03b", - "sha256": "1yb7ddzz3gsh4d7dgk3x6xgx3pgdqyrmqr6f4lxs9vhp102n7b1x" + "commit": "a6f8243ed2860cc7c9cb051496f1543d981e9f7e", + "sha256": "0fdzak693zb5lndxkdgb8af5hpichgkhhpxnl6pcnd1r6v01ahnr" }, "stable": { "version": [ @@ -100091,19 +100487,19 @@ }, "stable": { "version": [ - 25, - 3 + 26, + 0 ], - "commit": "4a2aef570deb2bfb8927426558701e8bfc26f2a4", - "sha256": "1fgvviv2zfnq4ap4qkndgryf8mkcbznzwdqnqc32vj4dmvsqxy9p" + "commit": "d6511091a0cab1ad13f676a02676ad2a0e5eb9ae", + "sha256": "0qi72mfwck0a3iwzvacl497bmz872pyzrdgya0w47r29y65z0m3g" } }, { "ename": "protobuf-ts-mode", - "commit": "ef4f38a4e91870ebfd8fcd4cfaf3463f77ac31e1", - "sha256": "0kpp1sqwbvipwac95gj873w1zvmsrwdcz3qangqz8bck2f48pvv6", - "fetcher": "git", - "url": "https://git.ookami.one/cgit/protobuf-ts-mode", + "commit": "feb6e7b10f4adb9c6ba3981b60f72db6f4cedb95", + "sha256": "1wx3yy624d4dx2gjfs8y8yfdmnl32xgy5wzbcnxvbhigjn4x6cbr", + "fetcher": "github", + "repo": "emacsattic/protobuf-ts-mode", "unstable": { "version": [ 20230728, @@ -101154,10 +101550,10 @@ }, { "ename": "pyim-cangjiedict", - "commit": "0086ad25357f8d1340e23c92ce066112c46a19b6", - "sha256": "16ljs7ldddnawxv66xsvh8cnxkfr9d07mchkvcajs9975g0axvah", + "commit": "9e0d6c5698267d6f355c319071c4a6b39640e3fd", + "sha256": "1y7np5g7c921vczj8h0jjzr68j08qx48dw2h8lgj80idk8mc8zhg", "fetcher": "github", - "repo": "ba11aStone/pyim-cangjiedict", + "repo": "con5tella/pyim-cangjiedict", "unstable": { "version": [ 20210617, @@ -101172,10 +101568,10 @@ }, { "ename": "pyim-smzmdict", - "commit": "e5f1fe26dad66865cfc8e7de87a7368fcba45c50", - "sha256": "18djbr5zybmr8gkn63kgxy18gsc8vf58xcs0v5q2i0dnd6ijaqms", + "commit": "49fec74868b77d36882176ab41473c3c8a0fd5c2", + "sha256": "0rymxr89vsr7j0pb49s8lrrnh79q395270b29z0w6s6hwyygqv3k", "fetcher": "github", - "repo": "ba11aStone/pyim-smzmdict", + "repo": "con5tella/pyim-smzmdict", "unstable": { "version": [ 20210505, @@ -101653,8 +102049,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20231106, - 1557 + 20240314, + 1038 ], "deps": [ "dash", @@ -101662,13 +102058,13 @@ "s", "transient" ], - "commit": "7e8acc0232355db35dc66a15bf50c14a80ba3e72", - "sha256": "0gl210nm1n5ynpirzn1h81zb4x0q6nl8biq2132chm3l5m58fapk" + "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", + "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" }, "stable": { "version": [ 3, - 3, + 4, 0 ], "deps": [ @@ -101677,8 +102073,8 @@ "s", "transient" ], - "commit": "aef8b42f7ca69d84289209c7bf0974c8ef4c95ab", - "sha256": "1a8086j4iq8qg230dx9nxcaivffyb7y5fga8fc1m5x4v9dh171x7" + "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", + "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" } }, { @@ -102191,14 +102587,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20240201, - 2014 + 20240316, + 807 ], "deps": [ "ht" ], - "commit": "248149b0261051bd9eec8bdbc21c22d18d7b1b11", - "sha256": "02qayvia6mx3lwps5x573srag4zf2wbxm0xk0mzfpdki3ffjwhhi" + "commit": "4604cbd7dff6996a0d35d4eb042a5623530763bb", + "sha256": "066lvxkw0xls8a0f243ic57nr6rlpwy71pgvi3wcm8zg8ky2r599" }, "stable": { "version": [ @@ -102356,11 +102752,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240219, - 1858 + 20240319, + 2002 ], - "commit": "9e8e60531ca90c5fd0f42c0e931f0c7f12103567", - "sha256": "1yxdgx6cdj7xq7zw85f6fp4h56qsavv57a7p88bnfp8lm1cz5r13" + "commit": "fd3e3ddf12aef6d7661b5a2c0f70afc7107b7fd9", + "sha256": "15ciqhns9q6gqv8wxjd71mijacpsi3lg4f1hqy8z58r7gzjr8av7" } }, { @@ -104453,10 +104849,10 @@ }, { "ename": "req-package", - "commit": "9bb31fb6eeb41a19b33a9edb86d8a0bd6c962042", - "sha256": "1dg670cp7gfb5w0lvyfk3f8b1ch104wd5ld12y568q4i5wkzhfcp", + "commit": "1202a12d3991df7de1bb57c59467f1532be52b37", + "sha256": "1w2z3mamx3adm05bqqxrph0q9cin12ia0n45jha3gbic5b7b4562", "fetcher": "github", - "repo": "edvorg/req-package", + "repo": "emacsorphanage/req-package", "unstable": { "version": [ 20180605, @@ -104601,11 +104997,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20230321, - 1917 + 20240312, + 1235 ], - "commit": "a0a21d1c037c78ba4c05108a5e7afd5f75fe7bd7", - "sha256": "11ik71xspqcgyn11f9mkda01vyn9q7bwpbzqjf6yd7yn5b83xrhf" + "commit": "e97487a8786dd329593c3a786443a6d987d719e9", + "sha256": "0cp8pv9isny0y9s0310y05afci3ars7ibf21y4sqmgadgfnp0qf2" } }, { @@ -104789,15 +105185,15 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20240118, - 611 + 20240226, + 37 ], "deps": [ "f", "s" ], - "commit": "c774564e3a35d8112ec3f399f76941cb63317a4e", - "sha256": "074r3v33k82s4xksihq52kl3hpxk98np7x7mqjiqvldmaqc3y6ym" + "commit": "ef1b86f745ff2e1d13dc57f6f9fe7e0c53fe26bd", + "sha256": "18gqrfxar906h4i4gn9wwwrpzi5cmnpzgfh1qkqhyjbh7wl3d37i" }, "stable": { "version": [ @@ -104845,14 +105241,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20230125, - 1846 + 20240315, + 1320 ], "deps": [ "seq" ], - "commit": "83c639756357c6b154842997b86e63c583ff8ff4", - "sha256": "08nnm6kvndsvnk7l1zr0zmbc0f6wsrfq284n80m2sxhx428k5jwh" + "commit": "bcd70b49b16abab53165cb464d0a9a5f95bf946b", + "sha256": "17br84xaxy1am01fdqi6742wwfp9aig1a71fmhvncpdi1plsxkca" }, "stable": { "version": [ @@ -104891,6 +105287,25 @@ } }, { + "ename": "reverso", + "commit": "ce59525a7710dde686c2dd023a593a89a51ff987", + "sha256": "0anw1l44qgxh7rhadcccw7fcfc8b0nwxd28vpzjkx8c2cr63p1pn", + "fetcher": "github", + "repo": "SqrtMinusOne/reverso.el", + "unstable": { + "version": [ + 20240113, + 2128 + ], + "deps": [ + "request", + "transient" + ], + "commit": "7ae99550cd6076009560c4c7a3e4cdf101826041", + "sha256": "025nd01w5sagiz56bpn7mihc5n9zr0s6bn6g3fimb7b1697h9rlq" + } + }, + { "ename": "revert-buffer-all", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "1diaxzznh60nhhj9jks8nriyzkw34h0qyjhbnlyscbsagg6gy9wx", @@ -105425,11 +105840,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20240105, - 614 + 20240301, + 1749 ], - "commit": "2643d71b34f53eccb6188f548f5d1349adef07fb", - "sha256": "0xnbp55nrs5wxhrfvym3sfqamf499mlzj6zsw9bhp6r1sjidl21i" + "commit": "1aeeadf7114316b9949e3c212a883ca95c3ddab0", + "sha256": "01nhxmildizza26vkf20qvmhh7n5g1sl7vyn7i1dwpi74334in64" } }, { @@ -105440,26 +105855,26 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20240118, - 348 + 20240319, + 254 ], "deps": [ "inf-ruby" ], - "commit": "0438ae818e2551637ee3ec8baf5bbf471eef9359", - "sha256": "0knawwja1dba172kjw8hypzvnngcsd9xspy2j42n66npi12yyky8" + "commit": "863dcfc41e15200e476995586c2aa7bc9cabc5c8", + "sha256": "02s2kp7nh924i2iwys1q3yx4zgwj9hxnfl0x3ny5lzz8j2ijb3vn" }, "stable": { "version": [ 0, 8, - 3 + 4 ], "deps": [ "inf-ruby" ], - "commit": "082da38797d247f9c64568ad712a345e041d5c84", - "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" + "commit": "34ce25eb9b1956389276adeca93b679bf0a84451", + "sha256": "0kvyfyr4b0z0l964a8z9shy8nlnxzxc2ljcc02gj2pn1rn1wz0gq" } }, { @@ -105566,14 +105981,14 @@ }, { "ename": "rom-party", - "commit": "d512cbf4962988eb163416f2a05432ba07cb0cac", - "sha256": "1z3k8nsrzzzxl1m17aj59y4zrki5czlcdsrxyfa66m6m7d133d79", + "commit": "aeb77fec281518c481fee27a734af4170e6f9605", + "sha256": "0zxix0mnq89ij5n4mqpsqqrr977c5xbv4f02hrl55n444gz59x93", "fetcher": "github", "repo": "LaurenceWarne/rom-party.el", "unstable": { "version": [ - 20240218, - 2044 + 20240324, + 909 ], "deps": [ "async", @@ -105584,8 +105999,8 @@ "ht", "s" ], - "commit": "0af8c03de584c91ea1a43c4c94fa4e7bb8c98fa4", - "sha256": "0y0rayvibf77508nv3p8k240m0agzfar5hr216fqask2rg0l9cfd" + "commit": "e4e8f113b370ceaed0ea28940117bd69f3d3f935", + "sha256": "0s14ki44iwaskfa2ky61by088f7h5s9frz621fpainfhx0i7m59r" }, "stable": { "version": [ @@ -106428,11 +106843,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20240217, - 338 + 20240313, + 157 ], - "commit": "8bbe70b72fde8046e12e6a41ffbee6c9f6b4ddd7", - "sha256": "0zza5d7ys062qss0lj7w28l496k2j0cykzlp7qmpchd4v5vzq9ky" + "commit": "87bf4ea711456c858445ec4c22b3552fd796708d", + "sha256": "16sc646nc54fnr52y5zrgpcr4rb7isbmc9gf8fd164k2x64h8gv0" }, "stable": { "version": [ @@ -106875,6 +107290,21 @@ } }, { + "ename": "satysfi-ts-mode", + "commit": "4bca9e68860dcf23f37ddd70ba3e47412061800a", + "sha256": "1p86scrvk97iw5vwm0phn0wk3zjc4hr94dk7nzckjlm9nlzb8m5q", + "fetcher": "github", + "repo": "Kyure-A/satysfi-ts-mode", + "unstable": { + "version": [ + 20240319, + 321 + ], + "commit": "b40d55ebd6ffeadadb85aabaf2e636110c85370c", + "sha256": "0l6n116nrvka2vpwkhd7pzrzjxmcjl4m8fscbk3rjl26xq139mpc" + } + }, + { "ename": "sauron", "commit": "9d30dcc4715422133e1bb00ad7a8e25b060387e4", "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb", @@ -107042,14 +107472,14 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240216, - 1536 + 20240224, + 1251 ], "deps": [ "compat" ], - "commit": "8d5650c5cfee96c42d64427bfcadb89f6bda66be", - "sha256": "08yia0q18b0w3lkr4wh1bd1v606cksi6hpz72nqjvv59qyjfmg01" + "commit": "1bae3dab16adf1f0d47befcc6d2b63a50af87231", + "sha256": "137kn3ilbl6gnq6jc21mzhlc7vyy9nvr3qf0p6f1hmdixm2cbyr7" }, "stable": { "version": [ @@ -107113,11 +107543,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240213, - 1734 + 20240309, + 1136 ], - "commit": "88f9ad9d8800515f47609829df9b2a15dc475eff", - "sha256": "04cm7my5kp8fv5d8an3h4a2z037y2kqvrarr20jj5a7b3fdxq0my" + "commit": "0a34b23b3b71be1e0ce307df873434c08408fc57", + "sha256": "0dzzygq4cfckmwr7a5lhr140kyy45z15q02r4c9kaxz9cjg4zdvf" } }, { @@ -107965,27 +108395,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231205, - 137 + 20240226, + 204 ], "deps": [ "prescient", "selectrum" ], - "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", - "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "prescient", "selectrum" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -108825,11 +109255,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240112, - 1749 + 20240227, + 2310 ], - "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad", - "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c" + "commit": "03afa7339930e5715c217455f3070c88a7fac55c", + "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6" } }, { @@ -109551,26 +109981,26 @@ "repo": "rnkn/side-hustle", "unstable": { "version": [ - 20230814, - 1047 + 20240325, + 205 ], "deps": [ "seq" ], - "commit": "602557d74229b377ee0e7d43ec70a6f9f84c81e0", - "sha256": "0ilgyg8dzvk2xqvm22jkydhw2a463g85mhhfx5sin42jvl8pi122" + "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "seq" ], - "commit": "786932352ce2f10214b801e872690e05b6102851", - "sha256": "09i5ds9ayid570x97glcy6cb8qdr5jc8riqfs7wl3hi4dif0z61a" + "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" } }, { @@ -109605,11 +110035,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20230518, - 1422 + 20240227, + 151 ], - "commit": "b6b66b6d5a8963256d87d87d02f94ae36b39e6f6", - "sha256": "1whzimns7hk69hh02djvghl91ciraj31yv4p1sa9p5vx2m4pg2hv" + "commit": "2b2b765387f2cbae9935c3ee6e2a32aa8d68f1b8", + "sha256": "1nbdip04zdk583s0glbfa5g657vvhsia3h19nr6gwakvlkgv33wb" } }, { @@ -109620,11 +110050,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240222, - 151 + 20240319, + 315 + ], + "deps": [ + "ht" ], - "commit": "3bd6315e8c3437b262d6f9975f37d94ac84d0720", - "sha256": "144f42jb5v8dz9ayj5q9v1zcy08xbivx6zf53yrpv6dyban1i37k" + "commit": "04a525f624e1a42c47a2755fbc63be32104f44cb", + "sha256": "1imbb2026vrlrqwjay05442q42w8a1vhb5chl6rdhs504vxaxdp3" }, "stable": { "version": [ @@ -109676,16 +110109,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20240101, - 918 + 20240313, + 2304 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "36262547f57699b02e456661156600b044ef26da", - "sha256": "1y24k66cjdq21pals5n01y2mj5nazn2nfiijww4znwzpaabsqi9p" + "commit": "1b3fc4d41b93ab3fa3754d188545d9e8cc0150f1", + "sha256": "0qh2v4jx0bvpcgac3h7kbd87bvgqdrvr7fw2m2syjspfbk7jqb65" }, "stable": { "version": [ @@ -109709,14 +110142,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20240101, - 917 + 20240309, + 1112 ], "deps": [ "sideline" ], - "commit": "e6b0e7dd7eea511aad1d9af1d944f1379bd7ad7d", - "sha256": "0viw2hhcy8af4knmcilzc9sp2dh4d0yakamyrqhgn2wn5a9q149z" + "commit": "e6a9ae69fc048f8eaacbf653e7136678dbef4597", + "sha256": "08mng3wqlrflnywiy8m29psk9sks32niy3xgzxrawkkidfv79m9p" }, "stable": { "version": [ @@ -110532,14 +110965,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240214, - 2218 + 20240324, + 2347 ], "deps": [ "macrostep" ], - "commit": "1b634dd03503a782882a4d078847920fe9544393", - "sha256": "1bj2bdqvxksrs3hr7p41ar0rrbffq0znzlyghr55kh22v2wns4bk" + "commit": "7e8e754f0eec45beeb7294b1c2d28257fa24ad29", + "sha256": "0q51rghv7baz2ni983cvzhmnxhskshwzcc6ab6x75rmayfwpipir" }, "stable": { "version": [ @@ -111331,15 +111764,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20231024, - 1804 + 20240324, + 946 ], "deps": [ "cl-lib", "dash" ], - "commit": "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3", - "sha256": "1svi5zfrg2ygsjb247y02c9i0cqmc5lqa7sq999niriblj5plr60" + "commit": "ddc6233ea6fc2da7a3a8e44face465c15631b02b", + "sha256": "1hv4v9451qjbakpw1ivz4yas8f9xbmxj48f1jn37y31x6j2d1bnn" }, "stable": { "version": [ @@ -111919,15 +112352,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20240120, - 654 + 20240228, + 1320 ], "deps": [ "dash", "s" ], - "commit": "8582dafd99131b755e32ecb231ae08025adfde98", - "sha256": "14v7nirbqyynadhzgms5ybiwn83i4dhh606gc5m04sf7ll7x10p5" + "commit": "50ead3321c448261d974ca05cd811fcd2232aeda", + "sha256": "1lx3mqmr8b3hccn6m6gzl12y3z8h6va7479daib1qy489inlk6wz" } }, { @@ -112356,6 +112789,33 @@ } }, { + "ename": "sops", + "commit": "ae47495104fdb4603da59f5ac5390aca935154de", + "sha256": "1gz0mnlmq7i8cmcj1r8yv1xzfgq076qqk743xpy0j9agffds4631", + "fetcher": "github", + "repo": "djgoku/sops", + "unstable": { + "version": [ + 20240315, + 2226 + ], + "deps": [ + "s" + ], + "commit": "9ed9f02ff83ab6e0cb0173f0578be1a5b71e3b66", + "sha256": "1120zfpnask7p3jspyk7yk1qq1g1m7vwp6kfxk7vd3yz9v732cds" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "b7b6784fb53659c3e8d103dbb027b12cf4846d8c", + "sha256": "1bls67w733cgpnm3b3rrw93jpkckrc4g7a4pprgnm96b3w4qrrkp" + } + }, + { "ename": "sorcery-theme", "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", "sha256": "18g4lkn98cjz5y4c2csziykq9ixafgixsxki04hfk9k1d9idixz3", @@ -112823,11 +113283,11 @@ "repo": "gnuhack/spanish-holidays", "unstable": { "version": [ - 20231212, - 2107 + 20240302, + 1542 ], - "commit": "cf892251468e6ba38c259f759bf31e7f9ad1c036", - "sha256": "0sjrzifbw0p13bl9lvwim5phhbwa7a868pzs6nxqhvxz88lx72bw" + "commit": "81ef3733da0ab807570c7fad1bab613bf7f30acb", + "sha256": "1d2hg6r4zc77xrmid7kz4w91g5ib13hl5kl8ak1w5glb51mfhfbw" } }, { @@ -112928,11 +113388,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240224, - 56 + 20240316, + 58 ], - "commit": "4554b88e4ba0636a622ac63aa084cd253feff7c0", - "sha256": "00zykhxmcrdl0s9yad0f2xsrgpid7wgwdaf88wjji2y3w92170m7" + "commit": "d1b325c8e7e2ac079de1314f91b980b354117248", + "sha256": "0870vlygdkyd8b6z9kykiqw48b64s0rrr68ir3ig30wmzs2r2441" } }, { @@ -113549,6 +114009,21 @@ } }, { + "ename": "sqlite-mode-extras", + "commit": "5c109bdc19547ac1483b07c54a81934458b525f5", + "sha256": "0v58wm0prl8hz1fzvg9vd7zxqmrd1zbbcnr4kjpqmy575mi9yxzf", + "fetcher": "github", + "repo": "xenodium/sqlite-mode-extras", + "unstable": { + "version": [ + 20240319, + 1312 + ], + "commit": "376aabe26607d40fbd572290296edaaafdf61bd3", + "sha256": "0xsk9b211nk2s6jxijvry5r75j64g3mazcd74iwkd21hq9hal5y8" + } + }, + { "ename": "sqlite3", "commit": "75bbc8a92954bd12b4c9d206a804c34c97b19e3d", "sha256": "1c7j8hzz8xs1nrn931apyj7nhwr3dnfbsrimb6fpdfmms8095y7w", @@ -114562,11 +115037,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20210721, - 1816 + 20240320, + 1707 ], - "commit": "1ecf7a7bbf9d88708eb2215e940753f8d6bccc92", - "sha256": "1994ypxz5zgrpdd5v61znf41c0dn4favab560wkgfnhhzrc1jgkf" + "commit": "e097f31b3bbb8581d045d0e684d3f129f90e8085", + "sha256": "091xwf9wivfzi3b8qmw6y2xl280nkvxmfmyr7nfvz0zxbdyim24s" } }, { @@ -115140,8 +115615,8 @@ "repo": "isamert/swagg.el", "unstable": { "version": [ - 20231128, - 2038 + 20240324, + 2014 ], "deps": [ "compat", @@ -115150,8 +115625,24 @@ "s", "yaml" ], - "commit": "097d1441a18eac7169b8a3fba9e253d7f489c6fb", - "sha256": "0rzrvx7cmmxf5fgrfa68z1idhd34q74wq3x93xi9h6xlghbzc2ii" + "commit": "747102ae3448e8dcd5209308447375fd0fee4f89", + "sha256": "1azagz784g73zrcd092qmc5abk2rc9zq225chp2db2mm0v1bf1c0" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "deps": [ + "compat", + "dash", + "request", + "s", + "yaml" + ], + "commit": "747102ae3448e8dcd5209308447375fd0fee4f89", + "sha256": "1azagz784g73zrcd092qmc5abk2rc9zq225chp2db2mm0v1bf1c0" } }, { @@ -115683,14 +116174,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20230729, - 807 + 20240311, + 1207 ], "deps": [ "seq" ], - "commit": "a783d7b5d8dee5ba9f5e7c00a834fbd6d645081b", - "sha256": "1ah4y3j0kdzf3ygrba5bjs04fpbpc9hwrzb8bb8ql0r42vdhbng5" + "commit": "de215fff392c916ffab01950fcb6daf6fd18be4f", + "sha256": "0n4102h319fpa2gqz6kdz9qx2r63lq9530xmg5mckkjsv8zd706d" }, "stable": { "version": [ @@ -115960,14 +116451,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20231218, - 1001 + 20240322, + 857 ], "deps": [ "cl-lib" ], - "commit": "022018c4de0d799c92301b76ea4f1775cfc9f510", - "sha256": "1xgghmdj1irbfxcz7fhxs7i0mrp6myska77m0piicryhqpa8ch9d" + "commit": "6cf74c73c9ef946819e3cb6faa8e482fb11ccd53", + "sha256": "0q959gaighs7qcyjyf0a1jqhc39b5zbivk5gvx4n54x65vy0lc2r" } }, { @@ -116216,11 +116707,11 @@ "repo": "ajrosen/tab-bar-buffers", "unstable": { "version": [ - 20220722, - 1937 + 20240227, + 2037 ], - "commit": "6d196d4b853c5355403da86607dfb31a038cc024", - "sha256": "1b2ihlymhzdz13140ywz95j5pz2vflnszvavd0ibxfw05y55ng2m" + "commit": "08a3f39c0b1673e3cad34e1f0e83fb56c903586c", + "sha256": "0rgxwyjkhlhzr4nbbjy08l4z26cic9dw4rhlkpkv9s51wxxnhaw8" } }, { @@ -116441,8 +116932,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20231123, - 1236 + 20240227, + 1429 ], "deps": [ "dash", @@ -116452,8 +116943,8 @@ "transient", "vterm" ], - "commit": "f6383e6b8af25ed6edd1ccd67a8791a7a0d06248", - "sha256": "1xq6r90apw7n4hfhrwh65mw4bq02rnv08j4jf8mwnw4ga204fnwi" + "commit": "a46629994b485472a442517e4c287e7a493deb9e", + "sha256": "162bid314jsgjf98i2xpxklwdhmnq0115ha6xr5qd8j6sch0f7xv" } }, { @@ -116464,14 +116955,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20240209, - 2300 + 20240306, + 1454 ], "deps": [ "project" ], - "commit": "b8799f477c2b467caf4cc5b740d3945d96b84eca", - "sha256": "0f1nqydm6ji2yq5kf1n8y3cijs0zqvyd2rm1yvr77crsyqy52m9i" + "commit": "73d9cecaeb671e14409c80b10a17be64acebc43c", + "sha256": "09h5lndv8sxv9v3s5jlg3yj949vfq3jf78h1zj59vpzgvgi5cf62" } }, { @@ -116757,10 +117248,10 @@ }, { "ename": "tbx2org", - "commit": "d616cbf4ad7e49807afd2f7acf0a0fd2f2a0bac4", - "sha256": "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8", + "commit": "78d82b77af53c95242ddc4879d6b923eb2463077", + "sha256": "1z8izwqbs3775car9fbwa52vn4y6mbnlr4q0lnzhfxf8fylkwlri", "fetcher": "github", - "repo": "istib/tbx2org", + "repo": "emacsattic/tbx2org", "unstable": { "version": [ 20140224, @@ -116861,15 +117352,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240214, - 1600 + 20240322, + 901 ], "deps": [ "rainbow-identifiers", + "transient", "visual-fill-column" ], - "commit": "ab03a5ead11e9a0abc96cae6025cd87135a71a57", - "sha256": "0mb911k3qnyr92x7f1ycj24qs41r01imy7yk6f32bdx0ri6921v3" + "commit": "7df0fead1683154dee24b3b61b4b575a89fab039", + "sha256": "09ppf5pgnan285hyfipa930wyi5qc8wf7b70wb9yh8xam7j1insf" }, "stable": { "version": [ @@ -117436,11 +117928,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20240213, - 2304 + 20240227, + 2236 ], - "commit": "0415b2d5ac16325039d0c6e4fdbc8a9e4694820f", - "sha256": "0432vlnr6cdwk5ndldd0vyv7r2wgin56mr40q5gdnxv4ppl6rnlg" + "commit": "c996304c1e873e561108a509129b9e4358d354d5", + "sha256": "0dk9wvsbx0szhn8r7ls4729fi2840ywwfir905b6dmvdxxy85q7k" }, "stable": { "version": [ @@ -117599,15 +118091,15 @@ "repo": "hcl-emacs/terraform-mode", "unstable": { "version": [ - 20231116, - 1525 + 20240321, + 2136 ], "deps": [ "dash", "hcl-mode" ], - "commit": "e8b57df8c2a3d3171f3768f60eb84067f553289c", - "sha256": "03gdyal1r0b64ljmnpz0wcq9rylfh06cv3vggcz81zvjnyssh9qi" + "commit": "a645c32a8f0f0d04034262ae5fea330d5c7a33c6", + "sha256": "17zb4adh8j333nc4w4ywnw4kvljbanrnkmf0k7m6nv71rp1v56fr" }, "stable": { "version": [ @@ -118186,21 +118678,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240216, - 1732 + 20240318, + 1244 ], - "commit": "eca43d4980a147304be41de85ae1e4f24e128fc3", - "sha256": "0cqkkzqwfm8lgypd0bkwhr5mkhq0fgmfifhdzibwj8mbqzbzkqp6" + "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", + "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" }, "stable": { "version": [ 2024, - 2, - 19, + 3, + 18, 0 ], - "commit": "eca43d4980a147304be41de85ae1e4f24e128fc3", - "sha256": "0cqkkzqwfm8lgypd0bkwhr5mkhq0fgmfifhdzibwj8mbqzbzkqp6" + "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", + "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" } }, { @@ -118575,11 +119067,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20231022, - 1816 + 20240224, + 2028 ], - "commit": "5fc2cad6c91748afa98d1df2b65b3b5329d21b03", - "sha256": "0hsn3q36pdgg4w2nxmszsr7d3n0wkc291i1v04nakknhw8fx6b0m" + "commit": "ec83fc030ad7c098637df6f3a56d844f8526c571", + "sha256": "0pf7sdcc6gpb5k8qmig7bgxhdqxl3jgah4wcvxcv8s8cfmmhrlfx" }, "stable": { "version": [ @@ -118627,19 +119119,19 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20240215, - 1822 + 20240317, + 2007 ], - "commit": "b99b7d77530748009366910b69c238b4c21f5bc0", - "sha256": "0yj9sy6iyya3p29kfhb4dlaz2sbq39alvkciv173w992g92cd5s8" + "commit": "6079fa1bf9859955d30d6c51e7d8105588a9b588", + "sha256": "0f8jawiszqw2xwac2c3ipr8jdx7vfi5wr6xyd491m3faif4rmzz6" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "665c6e409c7d6a37575b3e64961b17ae3db18cb8", - "sha256": "06jz2gz6qs0iyd466qxra17x80jigkmvpf4ynh5q9z2pq113mrn7" + "commit": "43c2ebc4364c227e9e8943478c21250c594b3c50", + "sha256": "0lb7nlvmjmhq5dpqd2mdhn1h4hyy09bkpqmvz9dh8jwmgp8gfr04" } }, { @@ -118650,11 +119142,11 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20230911, - 2116 + 20240224, + 2040 ], - "commit": "49df5e054c87044fdd941796f423a621b9495f70", - "sha256": "1v5srm1gbsy31384lys21hc4mj4xd7q3bkwhgjp8i9k0rrl0hrb8" + "commit": "2095a2bedb2682145407e149d1c2b1c0aa02a6f8", + "sha256": "0zzk4ydf245x8wz6sbmpnch614k7h0k8zyllw9x4l2paw4las5fv" }, "stable": { "version": [ @@ -118673,11 +119165,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20231010, - 2137 + 20240224, + 2010 ], - "commit": "fbe0aacc0d1010631ba8b2848b78e26514ce60c6", - "sha256": "0h8kkzgfz5hkynlynml0pgkq9j6fzzq33hl9ww8mq1gzzq6n62db" + "commit": "1cca501c9640a9f1d6bf717dc36df96d35deeeba", + "sha256": "13ymng05yvdx1pddnb8hwqs8drvgmkyhndqqahdcg3bd41qkijb6" }, "stable": { "version": [ @@ -119322,25 +119814,25 @@ "repo": "fledermaus/totp.el", "unstable": { "version": [ - 20240203, - 2152 + 20240227, + 1841 ], "deps": [ "base32" ], - "commit": "5fa6529ace892972d2d7ce08af88c7912a1c25a6", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "af2ca2f0623d5268e31f1fe19bc1370c14b601b1", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "base32" ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" } }, { @@ -119486,19 +119978,19 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20231119, - 1417 + 20240225, + 1112 ], - "commit": "1a66ac496465d5970d982b088809940286b77800", - "sha256": "06digshq994ggsiw9cfs4kfsj4xmp1byi5d5fs3wkqljdw08078n" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" }, "stable": { "version": [ 2, - 12 + 13 ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" } }, { @@ -119575,11 +120067,11 @@ "repo": "fosskers/transducers.el", "unstable": { "version": [ - 20240206, - 646 + 20240308, + 843 ], - "commit": "acf4588bc3113e8412451650b0c38243ed43db89", - "sha256": "0n7w3vpdvhci5j6i5v73cp3awcp3airm4rb6f2jhz3ni8ih9z1by" + "commit": "2d452e4cdc3b5cfa29ee3d7a645ff53d4e993384", + "sha256": "1k17mxkk7mdv07ji30njxdpkzgyjpn4v45p0am72wn1k1kyq4vim" }, "stable": { "version": [ @@ -119617,28 +120109,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20240221, - 1504 + 20240321, + 2209 ], "deps": [ "compat", "seq" ], - "commit": "ba37702ab3cf90191865172bd5581fd353ccba63", - "sha256": "0wl5x3dfkw41d8pvmyqn4g2jd2dyanncaxms6g2wqhfkp41rkg97" + "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", + "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" }, "stable": { "version": [ 0, - 5, - 3 + 6, + 0 ], "deps": [ "compat", "seq" ], - "commit": "72cf67d7e047a4f82e0e18bd016c7826bf2efde0", - "sha256": "0fr0pan4dffckfywnx7a0dkb2l71fnc47cqqqb1lckqwr1gr9z6l" + "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", + "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" } }, { @@ -120093,26 +120585,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240223, - 1000 + 20240324, + 1936 ], "deps": [ "tree-sitter" ], - "commit": "8b65f758e95705708e416f3fd535c664838a3083", - "sha256": "1kd2sjz73a0vqfl1g1fdfhg8y3r826gm6xhqlhxz31g1j69b8z5q" + "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", + "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" }, "stable": { "version": [ 0, 12, - 139 + 163 ], "deps": [ "tree-sitter" ], - "commit": "8b65f758e95705708e416f3fd535c664838a3083", - "sha256": "1kd2sjz73a0vqfl1g1fdfhg8y3r826gm6xhqlhxz31g1j69b8z5q" + "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", + "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" } }, { @@ -120189,8 +120681,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240214, - 2107 + 20240229, + 2108 ], "deps": [ "ace-window", @@ -120202,8 +120694,8 @@ "pfuture", "s" ], - "commit": "025b7ce326bec062a33d772cc6548e55f940c622", - "sha256": "00y15mn949vnm8yg1gqi66lp70kv5vnyknwnh4v3amamqbh5na15" + "commit": "8c6df39f01a4d47fda2cc943645fa067f771b748", + "sha256": "12jfivx5gqayv8n2q08f7inwqmxck51q0r9nxgb1m1kzi5vdisqp" }, "stable": { "version": [ @@ -120725,15 +121217,14 @@ "stable": { "version": [ 0, - 2, - 2 + 3 ], "deps": [ "dash", "s" ], - "commit": "0bf2ac9680ae077d6f110ea0629728fbc654e945", - "sha256": "0l35gz1hpada2kzascbyqgawa5d3sdyg67gzvak84p9zx62jppn8" + "commit": "552936017cfdec89f7fc20c254ae6b37c3f22c5b", + "sha256": "18lif159zndl19ddz9rfq12l90770858yasfns21ryl1yrq3aifr" } }, { @@ -120777,10 +121268,10 @@ }, { "ename": "tsort", - "commit": "ccd853a83f5acaeb74859fc2b5899693985c6ef7", - "sha256": "1xcc8k1bi3vbz87g969chqkdz5nqajcf2qj6sfcm4s01705p7r23", + "commit": "cf4164640ae2baf7610b4d10c8edd070969db0b0", + "sha256": "0x8idv1jjwfmda834dqhiff05f7q6i258iaiwyl1vbmck818kzhv", "fetcher": "github", - "repo": "ehawkvu/tsort.el", + "repo": "echawk/tsort.el", "unstable": { "version": [ 20231027, @@ -120897,14 +121388,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20220620, - 2028 + 20240322, + 2129 ], "deps": [ "request" ], - "commit": "bf722d441ff96ff8fac6c8d2a798e283fef5613b", - "sha256": "08cwyabcb0qzydsw14n9vk93y471yp8cyif9pcbmx2qrr9kd07xa" + "commit": "26c2627f70badfd4cf6069c31ebc20fa8b03136d", + "sha256": "0xqk230ah7dr2casm4hmxhp85dks030v310ah3n7az5csdzs6xpr" } }, { @@ -121172,20 +121663,20 @@ "repo": "KeyWeeUsr/typewriter-roll-mode", "unstable": { "version": [ - 20231130, - 1 + 20240225, + 1412 ], - "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", - "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" + "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", + "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", - "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" + "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", + "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" } }, { @@ -122427,15 +122918,15 @@ "repo": "smallwat3r/untappd.el", "unstable": { "version": [ - 20210815, - 1544 + 20240316, + 1755 ], "deps": [ "emojify", "request" ], - "commit": "8a31e5888ddd73ed5d2b6ac8ce27acc30f2b59fc", - "sha256": "0iawj6xhchfvbhnajyw7gjd0c8dwjyzqkg219ay22p8ffgpzqrw3" + "commit": "0b46faab755c8f6c4b70a45c24af1673465d9958", + "sha256": "042kw4sxazjvl7x90n4b7ilasc1z5lniw691wiz9jmzj8h1j3niw" } }, { @@ -122848,26 +123339,26 @@ "repo": "diml/utop", "unstable": { "version": [ - 20230707, - 1535 + 20240226, + 1308 ], "deps": [ "tuareg" ], - "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", - "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" + "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69", + "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52" }, "stable": { "version": [ 2, - 13, - 1 + 14, + 0 ], "deps": [ "tuareg" ], - "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", - "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" + "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69", + "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52" } }, { @@ -123304,20 +123795,20 @@ "repo": "tarsius/vcomp", "unstable": { "version": [ - 20230407, - 1426 + 20240302, + 2255 ], - "commit": "fdd010e9081d62aa6aaa1b25a2df925efd662d0c", - "sha256": "1kpafj5sxcd0qkxfnqqh9pl2wpjdy4vs04jjy1w33cdrz411k60v" + "commit": "99831d234481a61488aca4b96b842b63a79c732a", + "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "f839b3b3257a564b19d7f9557dc8bcbbe0b95842", - "sha256": "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak" + "commit": "99831d234481a61488aca4b96b842b63a79c732a", + "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7" } }, { @@ -123620,20 +124111,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240210, - 1127 + 20240317, + 1608 ], - "commit": "b3e3c3eeea21ffa24f5dc8bef6dd401cc25c199a", - "sha256": "06sk6gllhni4ai3nh304zjsv17fzpsficbp2zi2mbn6q8vd5siax" + "commit": "a430847beb925ae82007d70f32f3bab38f0054e9", + "sha256": "0amcnyslr4inpms48ricln6nm1yp1rkbrpv1qgabml3f70x1faz9" }, "stable": { "version": [ 2, - 15, + 16, 0 ], - "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", - "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" + "commit": "442e9ddaa658bc9e8d3e50f930e2024fd88a3aa9", + "sha256": "1jyav9y2awzaaiz8drlwgb3170pv6ra95zaichfyywdhxxny0fw5" } }, { @@ -123862,28 +124353,29 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240104, - 1357 + 20240226, + 204 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "864b352e7ecc649cd13ff23172c9cc8039129cc9", - "sha256": "0vfmzi5kj67il1ab3r91fkv72v0xk7d9bmc6y6abgqw8mqf5sjhq" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ + "compat", "prescient", "vertico" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -124655,11 +125147,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240102, - 1640 + 20240318, + 1617 ], - "commit": "e96c53f5035c841b20937b65142498bd8e161a40", - "sha256": "0k1pb505ld7nzkh60danrx3qsrb3ifcqcm0359qbhg1ls12mrsnm" + "commit": "303decd923ef83a184b861d34081fd8635484a03", + "sha256": "15srbva8s19valai3ji794k0fha2xz3jhw81rg75mpnwcd5cxynb" } }, { @@ -125179,16 +125671,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20240207, - 949 + 20240229, + 1209 ], "deps": [ "apel", "flim", "semi" ], - "commit": "c15e8ece4f34f10479e17cda19d10b98f6be3ec1", - "sha256": "1lsld77wql0n9vsdnpj2zb50r8ngcfjsi9fzl7mpv3929n99w3r2" + "commit": "e525f27d29e122bb8baefa1837816f9001fa5085", + "sha256": "0gphh1qh55jkg2a8gvwjf5f60jhjk3c3y40iikgvgw6hnx3aw8ga" } }, { @@ -125479,11 +125971,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20240210, - 1511 + 20240315, + 1838 ], - "commit": "f19788e76c2359075975c20b8fda1f0b5080f042", - "sha256": "0bilcgsinqdqgspkbx31gq44d7cz8xpj9xdnjflg70c7ppr505dy" + "commit": "a9d21841224da3295f2dd0a90022f5e435e48046", + "sha256": "19v4mwa1arnxrznqq8x7zsqlgvgznmw4yn8yd77jyr5lcvw43nax" }, "stable": { "version": [ @@ -126117,11 +126609,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240221, - 138 + 20240312, + 2033 ], - "commit": "5fbdf05351e77ee62e3933c7b5f46459693bd04c", - "sha256": "0bvw7qd0avik114dvlrfarzhx0rvwpa2jz0qx2n5wq8is08py6q3" + "commit": "96911a1d3faf8426a33241f4821319e98421f380", + "sha256": "0icplq3rnvaixx83phmwzspcw4wy1wzfcxhkf16fna2ik2i35829" }, "stable": { "version": [ @@ -126300,19 +126792,20 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20240205, - 2147 + 20240315, + 1929 ], - "commit": "5cd0e1724ed8159927df06ded55162d0c122c0fd", - "sha256": "1i3zwp4q3804q71q08vnc9am8lagvz2lx9h27pwry10dihcv4gz6" + "commit": "d4466b296721fa94b2ceab1c51bc9bfd8bbf4e0a", + "sha256": "0b9a45m0z8apbas9hbfry68cyy801cmvrzfxr54wni8bppbz7gcl" }, "stable": { "version": [ 0, - 3 + 4, + 1 ], - "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", - "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" + "commit": "d4466b296721fa94b2ceab1c51bc9bfd8bbf4e0a", + "sha256": "0b9a45m0z8apbas9hbfry68cyy801cmvrzfxr54wni8bppbz7gcl" } }, { @@ -126899,10 +127392,10 @@ "version": [ 1, 0, - 11 + 12 ], - "commit": "13e6fbf177e04153159a137168c880d3bc0d56e6", - "sha256": "1w2wx5001aiwky25kvk190d1bgz6g856nm5hhaggsyb1h9f5ws17" + "commit": "7c6239a779656cd55225ad24e15cc29bc896f834", + "sha256": "0m5ssl4ngk2jl1zk0fnsss0asyvwanjaa5rrcksldqnh2ikcr4bm" } }, { @@ -127260,11 +127753,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20231008, - 1456 + 20240318, + 2135 ], - "commit": "da8bfc29c1500bef27423c2be03e46aff1b9bdd4", - "sha256": "1d267ddzxns95zn4xgwyp55jz6ca3df1lq8npjskswnyvcczrxrb" + "commit": "6cd9e43c809267fc37e21e99d49ded4e4731b48a", + "sha256": "06m17drciv9nxb7344ir0gm7a3krz24krh78v167vnyvzv72abfr" } }, { @@ -128559,11 +129052,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20231120, - 546 + 20240317, + 1602 ], - "commit": "aa7f04d8aaeb1b580904a84cadf561721d9acdbb", - "sha256": "1kgig5b975gcxfyq4z69nmf70fr6cznl2p7hvga5dy680xxls5yd" + "commit": "7b5ce294fb15c2c8926fa476d7218aa415550a2a", + "sha256": "0hraswfb669iq510zdxvf642mkaylardxrj9a9lipsii26ibqrzn" }, "stable": { "version": [ @@ -128583,26 +129076,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20240223, - 1406 + 20240313, + 307 ], "deps": [ "yaml" ], - "commit": "504943460174febf36427c94483a3c63c7b28e26", - "sha256": "1qh33gffz7avi5gjw754rl2cif32hqv532za7wqsbzga5aags2vy" + "commit": "775c0a4b82c79da0eb91620fb0cbbf6c8642815b", + "sha256": "16l1nmi9rizrcmx53xc8yr4y6lw5cg26hnwbw6l38i9nzhklx23n" }, "stable": { "version": [ + 1, 0, - 3, - 5 + 0 ], "deps": [ "yaml" ], - "commit": "4599bcb552555a39b5fab99b425180cdc131213c", - "sha256": "1ihi9ydzws97r0n5y71xyiljg0099c8w5vym8riv8skzf15bf5yp" + "commit": "c5d4d7eb3d2221dea7ee8c04286f1272806929c1", + "sha256": "0b0s3c7h3l94743qqpx16djn4d6xsrb59yhmz3fr7afrysp7d77q" } }, { @@ -128802,14 +129295,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20240215, - 1909 + 20240308, + 815 ], "deps": [ "cl-lib" ], - "commit": "1ec7e3b6f79de076133f16da61e3d99f16668048", - "sha256": "0hk5k2sghl4j478pyp7n7dqq3iqz0rcf607cs51f2sy1y362f0gy" + "commit": "33587a8551b8f6991b607d3532062a384c010ce1", + "sha256": "1412iz2k8fvkgb0kdnmv7g3mw8fqa8smbxzs2w8c2ahbm4bprrfq" }, "stable": { "version": [ @@ -128832,14 +129325,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20240116, - 1646 + 20240309, + 1316 ], "deps": [ "yasnippet" ], - "commit": "db12b55cd08b614cbba134008566e48d7faf660e", - "sha256": "0a5iqh3jcnkf5l9df2pp73aqcpzafjyj4a556q4v2w17v0wwn7f4" + "commit": "9043f8275176a8f198ce8e81fadab1870fa165bb", + "sha256": "19czzfjcd9m34ga51m5s10rlxp3v4q7fbq0cb5mc99ahbl763z9n" } }, { @@ -129061,26 +129554,26 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20240210, - 1008 + 20240320, + 1033 ], "deps": [ "compat" ], - "commit": "bdb3d532308071cd912bfbf92963c9cabe79de7c", - "sha256": "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5" + "commit": "f9c28a527a60811c4b60bdd3730ca25c9522739a", + "sha256": "0idnvy7jgry8q3vf3532xdfxz62hc9qdn5ssb6mp32kmya9c3v3j" }, "stable": { "version": [ 2, 1, - 2 + 4 ], "deps": [ "compat" ], - "commit": "bdb3d532308071cd912bfbf92963c9cabe79de7c", - "sha256": "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5" + "commit": "f9feada5c09fa8245f0230696557f7e7ffa266f1", + "sha256": "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9" } }, { @@ -129893,14 +130386,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20240221, - 1019 + 20240301, + 1618 ], "deps": [ "reformatter" ], - "commit": "9ce200971008fa29641ab7bec80802b450b65646", - "sha256": "1s44mq24s5a6kbq09mwswwxn91p4mlgpm0k0ff13i68cxd7641li" + "commit": "b6f5375efeb97026410190f352f1044214fa0289", + "sha256": "0nll0ib9yvmjvysvvvmfdq5gl2zrwymzrifmmvifns8ddc2iv9ql" } }, { @@ -130548,11 +131041,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20200731, - 1238 + 20240311, + 941 ], - "commit": "b9b72b4918156f2f44aa544be9e19ea391937c2a", - "sha256": "1jvk8g8qc83y6pmklk403mikl6q3s6gls60fyw07p8f3kvhgfxzi" + "commit": "cd7ae7400177b3c233a77c2a46de818c72375362", + "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw" } }, { diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index c48550f8680a3..a525335646169 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -68,6 +68,7 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true +, withDbus ? stdenv.isLinux , withGTK2 ? false , withGTK3 ? withPgtk && !noGui , withGconf ? false @@ -77,6 +78,7 @@ , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false +, withSelinux ? stdenv.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true @@ -227,8 +229,9 @@ mkDerivation (finalAttrs: { alsa-lib ] ++ lib.optionals withGpm [ gpm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals withDbus [ dbus + ] ++ lib.optionals withSelinux [ libselinux ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ gsettings-desktop-schemas @@ -338,6 +341,8 @@ mkDerivation (finalAttrs: { (lib.withFeature withTreeSitter "tree-sitter") (lib.withFeature withXinput2 "xinput2") (lib.withFeature withXwidgets "xwidgets") + (lib.withFeature withDbus "dbus") + (lib.withFeature withSelinux "selinux") ]; env = lib.optionalAttrs withNativeCompilation { diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 8cd257302cd64..c8f80ef9fe6c9 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -4,8 +4,8 @@ }: let - mkArgs = { pname, version, variant, rev, hash }: { - inherit pname version variant; + mkArgs = { pname, version, variant, patches ? _: [ ], rev, hash }: { + inherit pname version variant patches; src = { "mainline" = (fetchFromSavannah { @@ -73,14 +73,35 @@ in variant = "mainline"; rev = "28.2"; hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; + patches = fetchpatch: [ + # CVE-2022-45939 + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; + hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; + }) + + # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; + }) + ]; }); emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.2"; + version = "29.3"; variant = "mainline"; - rev = "29.2"; - hash = "sha256-qSQmQzVyEGSr4GAI6rqnEwBvhl09D2D8MNasHqZQPL8="; + rev = "29.3"; + hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { @@ -89,6 +110,27 @@ in variant = "macport"; rev = "emacs-28.2-mac-9.1"; hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; + patches = fetchpatch: [ + # CVE-2022-45939 + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; + hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; + }) + + # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; + }) + ]; }); emacs29-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index d7e5ac0ba1ebe..eb985016b1783 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -4,6 +4,7 @@ , mesonEmulatorHook , fetchurl , python3 +, python3Packages , pkg-config , gtk3 , gtk-mac-integration @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 + python3Packages.wrapPython vala wrapGAppsHook gtk-doc @@ -85,6 +87,16 @@ stdenv.mkDerivation rec { # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; + pythonPath = with python3Packages; [ + # https://github.com/NixOS/nixpkgs/issues/298716 + pycairo + ]; + + postFixup = '' + buildPythonPath "$pythonPath" + patchPythonScript $out/lib/gedit/plugins/snippets/document.py + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gedit"; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 323218f9437bf..382104a3d7f70 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,31 +1,22 @@ -{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: +{ fetchzip, lib, rustPlatform, git, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.10"; + version = "24.03"; # 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-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA="; + hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc="; stripRoot = false; }; - patches = [ - # Fixes implicit int error in rescript grammar when building with clang 16. - # https://github.com/nkrkv/tree-sitter-rescript/pull/227. - (fetchpatch { - url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; - hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; - extraPrefix = "runtime/grammars/sources/rescript/"; - stripLen = 1; - }) - ]; + cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; - cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; + nativeBuildInputs = [ git installShellFiles ]; - nativeBuildInputs = [ git installShellFiles makeWrapper ]; + env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; postInstall = '' # not needed at runtime @@ -38,9 +29,6 @@ rustPlatform.buildRustPackage rec { cp contrib/Helix.desktop $out/share/applications cp contrib/helix.png $out/share/icons/hicolor/256x256/apps ''; - postFixup = '' - wrapProgram $out/bin/hx --set HELIX_RUNTIME $out/lib/runtime - ''; meta = with lib; { description = "A post-modern modal text editor"; diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index b503a7c6759c9..b44aa560e5432 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -168,5 +168,16 @@ "longDescription": "WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code.", "homepage": "https://www.jetbrains.com/webstorm/" } + }, + "writerside": { + "product": "Writerside", + "wmClass": "jetbrains-writerside", + "meta": { + "isOpenSource": false, + "description": "Documentation IDE from JetBrains", + "maintainers": [ "zlepper"], + "longDescription": "The most powerful development environment – now adapted for writing documentation.", + "homepage": "https://www.jetbrains.com/writerside/" + } } } diff --git a/pkgs/applications/editors/jetbrains/bin/update_bin.py b/pkgs/applications/editors/jetbrains/bin/update_bin.py index 31271d1dffed9..604499203363a 100755 --- a/pkgs/applications/editors/jetbrains/bin/update_bin.py +++ b/pkgs/applications/editors/jetbrains/bin/update_bin.py @@ -68,7 +68,11 @@ def update_product(name, product): try: build = latest_build(channel) new_version = build["@version"] - new_build_number = build["@fullNumber"] + new_build_number = "" + if "@fullNumber" not in build: + new_build_number = build["@number"] + else: + new_build_number = build["@fullNumber"] if "EAP" not in channel["@name"]: version_or_build_number = new_version else: diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index a650e905bddfd..c7f7009465cdc 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -3,492 +3,524 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "e0add1e84352e368ad4c8de0ff8ea003dc56f3ee92c503e93bfddf4a56e97f31", - "url": "https://download.jetbrains.com/cpp/CLion-2023.3.3.tar.gz", - "build_number": "233.14015.92" + "version": "2024.1", + "sha256": "a753369d74832d15fcf082587291921e8a90be04529c05b8e9d64a3afb24120c", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.tar.gz", + "build_number": "241.14494.288" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.3.4", - "sha256": "7b653e07c6d2008fbc85955041490b77551e277ef20f8518f6e6a8cbd326339c", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4.tar.gz", - "build_number": "233.14015.137" + "version": "2024.1.1", + "sha256": "05c1f910126b8499d26ab52d333307d3b6df6a3fa06b5e0b1a79ff15caf40e0a", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1.tar.gz", + "build_number": "241.14494.283" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "1f46730744eb6db361ee858b9e5448c6ca69a83f2fec6a055bf7a43ce14e9c47", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.3.tar.gz", - "build_number": "233.14015.111" + "version": "2024.1", + "sha256": "4f73d514dcbf5dce769e7ee4e0a81a1d8dc970f6553c246e3016963b9f077dca", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.tar.gz", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "411a4d964a9b12f0cd0c0eaf47eec8c8e1da85c39bb50d0794905dd490a2b18a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3.tar.gz", - "build_number": "233.14015.129" + "version": "2024.1", + "sha256": "d777e88a3098790e19a93cb14fe4a21c740553958514e2b55fa2ba588f5c2c78", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.tar.gz", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "18a692790f0d4e2d40cedebb954aed074f72bb67ba4bdb63b7a4cb4df2c216c7", - "url": "https://download.jetbrains.com/go/goland-2023.3.3.tar.gz", - "build_number": "233.14015.113" + "version": "2024.1", + "sha256": "783539f254e4d62f4fae153a9e737f1d69db1e44676c4d1513775571a68950e4", + "url": "https://download.jetbrains.com/go/goland-2024.1.tar.gz", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "dc123ded3c7ede89e7cd3d4d5e46fada96b8763f648cd0cdbc5b7d6e26203fd2", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3.tar.gz", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "01d1b224c5e88592f954b17796a76fa8391cdcafef27264e703c7ffe47bb4065", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.tar.gz", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "d9bb8259d69f57d3dd674d1a1cce9ce372d5bea7bdab9685aa466b66f04e535f", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3.tar.gz", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "b9083da939eacbcdf24b84cb9c45a1291bb33715f05fc7e10f2cff065d7c3fea", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.tar.gz", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.2", - "sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", - "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", - "build_number": "232.10072.781" + "version": "2023.3", + "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c", + "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.tar.gz", + "build_number": "233.13135.979" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "83fae32882fdb58495f740d9e7a7d223186f2f80325892cc3cd7edad39bd200f", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3.tar.gz", - "build_number": "233.14015.96", + "version": "2024.1", + "sha256": "11c6862954f87b89d081cc0382e54b105d8b0c933dae78fd952cd2a3604889b2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.tar.gz", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "f71513f428f5df3b97b09c415967ff2db3a4e7172f293e621b3f04cd1d695443", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3.tar.gz", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "96048ea55ef45f1af0ebe12ad0e38e2763c9e5d654b9e174b33aaa12665d836b", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.tar.gz", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "29c4955410b2ea26f0cd0f44e02c8fe2b1b7dad075f0739652051faa6f84797b", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3.tar.gz", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "2451d3ef7642151306354418c5237b326271e2653a09b869e5883a262a2916ad", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.tar.gz", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "e4b351d90a198c473b9ae5d9427a802c8e9d923644c4aff9cc6c16ccc994ebd0", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3.tar.gz", - "build_number": "233.14015.60" + "version": "2024.1", + "sha256": "194096b0b550e1e320fc72aaf0510faeebf8737d05f6e02eecd72efe6f7cd757", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.tar.gz", + "build_number": "241.14494.307" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "a0d8533b0aad083689d61899b74e1c4405ba247b6d981c6378199106b14db74f", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3.tar.gz", - "build_number": "233.14015.117" + "version": "2024.1", + "sha256": "4fd9dcf83a1d1f6b7513c18383938bd65b2479fdb39c0421e2237a1e340c3912", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.tar.gz", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "version": "2023.3 EAP", - "sha256": "8d3e95f563641c20109ddd7572382663202c048a49b3ee0880cf4f69457d7f29", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127.tar.gz", - "build_number": "233.13135.127" + "sha256": "a7176fb06c18ce50f8f901ecde9fa75e968ddf27e3366e70bffd7ad1208fdde9", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.tar.gz", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.3.3", - "sha256": "c56ece93853aff41bc4b1fa7c40be086c8d0cb8346891ecd47a70c3978c66cd3", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3.tar.gz", - "build_number": "233.14015.89" + "version": "2024.1", + "sha256": "d4c7cb7f1462c2b2bd9042b4714ab9de66c455ab9752c87698dc3902f0d49a2a", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.tar.gz", + "build_number": "241.14494.235" + }, + "writerside": { + "update-channel": "Writerside EAP", + "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", + "version": "2023.3 EAP", + "sha256": "8eae1c965c1b5dae17c580cd3ed9b2a6182a3b54a54f8e6152472815118ae2c2", + "url": "https://download.jetbrains.com/writerside/writerside-233.14938.tar.gz", + "build_number": "233.14938" } }, "aarch64-linux": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "1b129162abaadd6f824d036c82f013baeddb8cd002f72321c6ecb12a3ba3a9e7", - "url": "https://download.jetbrains.com/cpp/CLion-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.92" + "version": "2024.1", + "sha256": "f937b263bd697595427e3e1d04513f9b6a786d56214ce34fe7a038efa2e949cf", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1-aarch64.tar.gz", + "build_number": "241.14494.288" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2023.3.4", - "sha256": "aaa39f525d680dc8a8b874cd66bd071da86e85c5c903e6cc8fa3d9952fd7c209", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4-aarch64.tar.gz", - "build_number": "233.14015.137" + "version": "2024.1.1", + "sha256": "d269bfe10fb97572e785dce6e387d09f429396db002e12ecb9a44cced915c032", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1-aarch64.tar.gz", + "build_number": "241.14494.283" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "87996adb4cf2c28ea68ebb6dbdfacfd65224446b48fbbf2ebf9dfb9627e39de2", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.111" + "version": "2024.1", + "sha256": "f1adfe94bd6482a4f15db02611afc7487d59c47f8ee120e925feeb23c980cd9f", + "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.tar.gz", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "69708ad33b9a9af71beea5fe7ead6f3208b84ee673a37999f40ccff46f26a1bf", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.129" + "version": "2024.1", + "sha256": "3b6ffb21148d3327e9a5558c5657c22f7076c6208e8a10836f155d8f0200fb36", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.tar.gz", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "dfe17fa21cbcfc7a050a03194c063aafc248876e393360dce5b90aa790082de2", - "url": "https://download.jetbrains.com/go/goland-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.113" + "version": "2024.1", + "sha256": "f3cae5c83ca99d3b0e0ef20282f2434879ef89a59ca2c770c31b855e45b8f6f3", + "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.tar.gz", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "9c1bd513e8687d185aa7c7fbb80a3e43949067ca312271b2d8ee5059236443fa", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "a13e7a53b5c8a512fbcb72957f24e5515618a5533f17d72914da5445b736dac1", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.tar.gz", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "65e4c672f394ffd4fabc14570d95dfe05ade7fae3f056ab1e8dd902bedf166bf", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "e73756a96a2e958441facb2b9be7ba30b463a63235f37a757866800162f293bd", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.tar.gz", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.2", - "sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", - "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", - "build_number": "232.10072.781" + "version": "2023.3", + "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c", + "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.tar.gz", + "build_number": "233.13135.979" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "7e1b0a6f5fe0ddf832e286544fd1fc4de9ad1d0ef1882f4b1ee4d380e49affdd", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.96", + "version": "2024.1", + "sha256": "0c5debd888359b37c9c95176c09a16e94f2412fb88f98b928e64ed2466f88ec1", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.tar.gz", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "6e8340b494d73e3ff8de46a3e6e70ff8198b76c989c859faef59cc18724a36a2", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3-aarch64.tar.gz", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "de8259a4cea264a2263bf771d74949ca25a2b9a8ffc5bbbc7c42d2faace6bd09", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.tar.gz", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "bf0d8935b316ca2ce2b27a8ee98042f50a0b69ab1a7bb7bb1278941178d54fcf", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3-aarch64.tar.gz", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "a1f43b2392b7fc6b0c062524593c19fb0721b4ec1a1a59a06e39a61da2dce258", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.tar.gz", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "72681b8627b10d4e23177e729d37ee96f870442edd12d4306b9406d95446d420", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.60" + "version": "2024.1", + "sha256": "e196c8e70d7eb6f56a08df809f5de430bf5e61509abb13de8b301c036c4f446e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1-aarch64.tar.gz", + "build_number": "241.14494.307" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "cb8ef50e2a5abdca78a713584798851bf736af2b1a67c861f8a750a09d3631ad", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.117" + "version": "2024.1", + "sha256": "690f90bd8a974585414e499aa2cb46d68dbc8145906e98d7f3b4ad1f3bf49040", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.tar.gz", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", "version": "2023.3 EAP", - "sha256": "f99755d11d410ba453e1ef70a22aed15a02da292933222de64067b4f2d3cdcef", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127-aarch64.tar.gz", - "build_number": "233.13135.127" + "sha256": "4e03720aae12b32f91d4ddf4e01cfb454311b8a0b901dcee733d62579aa4cc0c", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.tar.gz", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2023.3.3", - "sha256": "14fe97e2ed2b7a2c283266159d571f955631abb527b2c728e4b837cdacf2a5fc", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3-aarch64.tar.gz", - "build_number": "233.14015.89" + "version": "2024.1", + "sha256": "6691e4855fd4ecf3da9b63b78a11afc3441fb2139cdc7e7aaa5d78aa92a88c12", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.tar.gz", + "build_number": "241.14494.235" + }, + "writerside": { + "update-channel": "Writerside EAP", + "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", + "version": "2023.3 EAP", + "sha256": "b09dac04217d5d523501bdb1e9026fd17fb6370dff2610502472bbf6a48323d8", + "url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.tar.gz", + "build_number": "233.14938" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.3.3", - "sha256": "ad93d0e6b8e580db3063e36c349fd470cc47766d51287569b87b3e947463aa55", - "url": "https://download.jetbrains.com/cpp/CLion-2023.3.3.dmg", - "build_number": "233.14015.92" + "version": "2024.1", + "sha256": "373c78ff045a17fdcae44cc9b76b41862d4bee9c8476813e518c7cc1de88b6a1", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1.dmg", + "build_number": "241.14494.288" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.3.4", - "sha256": "730a1f17882432ad01b936a6d621c4c3acbfce0bd693b3ca4ee488182ab04d99", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4.dmg", - "build_number": "233.14015.137" + "version": "2024.1.1", + "sha256": "232582204a6f810bcbd2387ba2cef824f0f81c3a7e022f7f2bebf643d32f866d", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1.dmg", + "build_number": "241.14494.283" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.3.3", - "sha256": "fb302153ce044e8b6bb4df5935e25d4464bffe690bd2b94ef2d60b18299ec8b2", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.3.dmg", - "build_number": "233.14015.111" + "version": "2024.1", + "sha256": "a48036f55ef8301d6f77f726c68d7415c0056ddb4143ca3eed2698306f2c021f", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.dmg", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.3.3", - "sha256": "9a96c387bcd0ba9d84fd53ba2ae37d0370809d27a0fdb63e18664fdf5ee7f53f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3.dmg", - "build_number": "233.14015.129" + "version": "2024.1", + "sha256": "fb37fe7ba94f151f9613134b232b79f44524c126152f70eeb31421cee89b514d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.dmg", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.3.3", - "sha256": "2e459e390988e2d196add580c8cbfce8132ef0a4d55709d7495cb65a195ed4f9", - "url": "https://download.jetbrains.com/go/goland-2023.3.3.dmg", - "build_number": "233.14015.113" + "version": "2024.1", + "sha256": "4684665fa5d33e3b97a445ffdb29238b995408537be0f706ce05ef1505ffb632", + "url": "https://download.jetbrains.com/go/goland-2024.1.dmg", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.3.3", - "sha256": "291308af0dcb276dd2103affb4cdfb55c29135eb411fed2ac6f5a73270525688", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3.dmg", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "a0ed1fbb4f7c69a046869b3e1cd61faee193518374ac5d4dde4256f846c3b4e2", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.dmg", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.3.3", - "sha256": "48ea080e2e444bd6f9c27f9d9e958df4d09bc4df98457cf2ebf7f25a4a2cded9", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3.dmg", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "aaecd61f3258d555cb5b2993d04a56955f6dd4cb7a393b58928e4548817750e1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.dmg", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2023.2", - "sha256": "11a635432beaca5809fe0253303d07444a0bfd6fac287c72e7b03e7a9f1a59e4", - "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos.dmg", - "build_number": "232.10072.781" + "version": "2023.3", + "sha256": "c1e46dcb3429772b164f423cedc644f388217d1e7310d682b2341f9e744333bf", + "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3-macos.dmg", + "build_number": "233.13135.979" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.3.3", - "sha256": "082d432eb363b274fa4eea2f743518dfcf29deb0e7be34f64152d5b114415daf", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3.dmg", - "build_number": "233.14015.96", + "version": "2024.1", + "sha256": "75699ce909f07de35a6e89745c652f08afba5096b7930fdc51683989967fcc62", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.dmg", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.3.3", - "sha256": "b42894264cf0f14fe5a93807999c89870c6709e3f1edf9d629ea74c151825451", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3.dmg", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "86162e01cba91d7fac7f06442ba4f2b969191cef3bba7c11fced30ac4aa87b34", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.dmg", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.3.3", - "sha256": "c86b6e279ac6a82ce79e187c96b671c1b3bbb6cc2c7c5686454705316b398e9c", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3.dmg", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "32882869eb3dbe44ed74ff5c916222cf7f60af23775c58430e2967b0cbe90846", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.dmg", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.3.3", - "sha256": "a90346a30523eaa2e3abf57abd3949f46e0c6e6d2ea0c62c36d40b07061626cb", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3.dmg", - "build_number": "233.14015.60" + "version": "2024.1", + "sha256": "12155c779c7f11dd71b3573af266c0221960eaea8a442fda4faaec8ca6eefa95", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.dmg", + "build_number": "241.14494.307" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.3.3", - "sha256": "5fcba619de2c19b969aa6ce200c859a196de6597476cd9c31b8ffef415486b8b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3.dmg", - "build_number": "233.14015.117" + "version": "2024.1", + "sha256": "47ff2d04362beb2acb3421780f9c5f3dd5ef02aa2cdd9cef2c64a10c6ce2c062", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.dmg", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "version": "2023.3 EAP", - "sha256": "f52d5ed316e92ff259aa097fce6c4d8985567373f08d2551ecfa49970c3b3c21", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127.dmg", - "build_number": "233.13135.127" + "sha256": "b59ff55e4ba22df41acc9870f88b7f957f31af179e482ccaa4320b1f1ffff346", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.dmg", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.3.3", - "sha256": "e576a6adeda21bff4eb4bb7d250bb30ba4e773e9bd8728b05fa6d6dc6eea6756", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3.dmg", - "build_number": "233.14015.89" + "version": "2024.1", + "sha256": "b3b41e5e8559e36e0bd4121dee61d39a8ba5b5ce8193e7b026c5bc261e973df5", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.dmg", + "build_number": "241.14494.235" + }, + "writerside": { + "update-channel": "Writerside EAP", + "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", + "version": "2023.3 EAP", + "sha256": "53c7ad5a8808776b60eb82b3155c6f3a2a0dfad43ba8d9238a0db1752d503b09", + "url": "https://download.jetbrains.com/writerside/writerside-233.14938.dmg", + "build_number": "233.14938" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "4f8d01238149ae479e07762063011fd9b4b7c5c2ae355348810691d51f646bfb", - "url": "https://download.jetbrains.com/cpp/CLion-2023.3.3-aarch64.dmg", - "build_number": "233.14015.92" + "version": "2024.1", + "sha256": "b1044fdbf9e3f93aaf8ca8ad2b7bc2eae165f86bc5cae6910f2ad0ee92c198a5", + "url": "https://download.jetbrains.com/cpp/CLion-2024.1-aarch64.dmg", + "build_number": "241.14494.288" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.3.4", - "sha256": "2dc136c60d6c4c2cc13dc2d426c564dd34e56625dfbfb84d1900b175ea5d6273", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4-aarch64.dmg", - "build_number": "233.14015.137" + "version": "2024.1.1", + "sha256": "c2545df9784fa1f8f9234dd93d1c513ed691c797f26471cb545188ce7f495864", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.1-aarch64.dmg", + "build_number": "241.14494.283" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "db05a2acc6a5a15b1bca9e8f68b96f975d8860df35b1bd37c0d5803af4080ee0", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.3-aarch64.dmg", - "build_number": "233.14015.111" + "version": "2024.1", + "sha256": "4a8abf8cf816f98502cf58cd3de07c28d496d4fe20d338cee0ac714196b8a612", + "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.dmg", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "ec6150b6336d831a03ad7336bedc70d7c6f319f958bbf012c59671db42764173", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3-aarch64.dmg", - "build_number": "233.14015.129" + "version": "2024.1", + "sha256": "c82392faec283b2a6ab25dd0cbd8c3733ea046799d9d95ba4b5d6086767f7715", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.dmg", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "4b192b5a59d86ca8f20377d7905e8a91aa1f53e99bb868ff74d9d0959b54d9c4", - "url": "https://download.jetbrains.com/go/goland-2023.3.3-aarch64.dmg", - "build_number": "233.14015.113" + "version": "2024.1", + "sha256": "92b8567751ceb8aaa95535cbe76d495035be9602fa84cccb18e6e25bbd2bcff5", + "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.dmg", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "dad35642f993830970975ed81c7b04f89171dba0dde9e4ccf7ea29b24392603f", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3-aarch64.dmg", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "e49f9a3dc01bd28aa4065642352f358d8b17680ff7207145c918d1f52b046447", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.dmg", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "ccd1dc932b3bdfabe629c38a85716ce561dbf0f4512533a62acc503648dbaa22", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3-aarch64.dmg", - "build_number": "233.14015.106" + "version": "2024.1", + "sha256": "fd09f791834713e02c7cd28e4bf35b89e6f55e09970db3a720a4c59044874973", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.dmg", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2023.2", - "url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos-aarch64.dmg", - "sha256": "a19ecd8a109783e9d2260cc18f48ac97e52a0bc00ee29df5ccf711a80d1701eb", - "build_number": "232.10072.781" + "version": "2023.3", + "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3-macos-aarch64.dmg", + "sha256": "133e5bae81d675a6ee7780efec18dd96dfed059dbfdd2ad4a1028d9956a1ec6e", + "build_number": "233.13135.979" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "052bf5e1676410b0ce25574c57c56470ee3d2d8f4b0d776c1de6bb841a6eb3bd", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3-aarch64.dmg", - "build_number": "233.14015.96", + "version": "2024.1", + "sha256": "02bcb551de99cf070e90b2131b41f0b3e93aa776615bcfba1508e4c4d1bb9378", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.dmg", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "1e4dd6fb00d7557ba381406279818a3e7892027eff0fbb1b6cdf4b112c47899e", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3-aarch64.dmg", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "0cd62c5640d455e576a502fb23d5e6f3b71a2507e838bdec1a1be6a3fd6804e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.dmg", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "84fb09938539dc2f7ecfbd9be20a916cf542fc4e0b69a319d17e4180e4d6a244", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3-aarch64.dmg", - "build_number": "233.13763.11" + "version": "2024.1", + "sha256": "9c1d71668eb5de90f1f498477630a5d474a10ec90ee6ca61a8039f42505f5ca7", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.dmg", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "2d6d425610a8d14616cf9a18a0048d678164fcc45f4f5a8ee3fff695012a0c43", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3-aarch64.dmg", - "build_number": "233.14015.60" + "version": "2024.1", + "sha256": "c2e0dadc6c7f924e849e87d1c04aeaa02d6a14d5868294dd36481a70cbd508cb", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1-aarch64.dmg", + "build_number": "241.14494.307" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "1e9b62b495709c5d40af0aa9e5bdca21658dc23339659bcc3d5666ef45686281", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3-aarch64.dmg", - "build_number": "233.14015.117" + "version": "2024.1", + "sha256": "7e085580ebc8aadb9342e7362e3078b988e38fe8b5bfe8c4825a1744ad53c33f", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.dmg", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", "version": "2023.3 EAP", - "sha256": "dc4edbd94363753084dbf2dfbeff6a13af681465e3ece8b60b2382b11e516793", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127-aarch64.dmg", - "build_number": "233.13135.127" + "sha256": "03e7c1e3c029cd72ddc9422cc1dc54ed581356b278127dc8d2b2f9e53d357054", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.dmg", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.3.3", - "sha256": "30b9c45af873991c0d2dca508b42e61fa6a7ea752ac00bb93c1e519d15ef277c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3-aarch64.dmg", - "build_number": "233.14015.89" + "version": "2024.1", + "sha256": "95dd3a397fe063583c5e3ba4fefafdfcad740c18447c1a70c0f03cb004436496", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.dmg", + "build_number": "241.14494.235" + }, + "writerside": { + "update-channel": "Writerside EAP", + "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", + "version": "2023.3 EAP", + "sha256": "2a78fbcabcdd5b7c906d933dd91ac927bde22ae3bba988dad7450184fd90457a", + "url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.dmg", + "build_number": "233.14938" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e40fa4c68d721..a88785e708178 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -100,10 +100,12 @@ rec { clion = (mkJetBrainsProduct { pname = "clion"; extraBuildInputs = lib.optionals (stdenv.isLinux) [ + fontconfig python3 stdenv.cc.cc openssl libxcrypt-legacy + lttng-ust_2_12 musl ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ expat @@ -141,7 +143,10 @@ rec { extraBuildInputs = [ libgcc libr stdenv.cc.cc ]; }; - gateway = mkJetBrainsProduct { pname = "gateway"; }; + gateway = mkJetBrainsProduct { + pname = "gateway"; + extraBuildInputs = [ libgcc ]; + }; goland = (mkJetBrainsProduct { pname = "goland"; @@ -188,7 +193,12 @@ rec { libxcrypt lttng-ust_2_12 musl + ]++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + expat + libxml2 + xz ]; + }).overrideAttrs (attrs: { postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' ( @@ -240,8 +250,6 @@ rec { --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so - interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper ) ''; @@ -249,6 +257,8 @@ rec { webstorm = mkJetBrainsProduct { pname = "webstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; + writerside = mkJetBrainsProduct { pname = "writerside"; extraBuildInputs = [ stdenv.cc.cc musl ]; }; + plugins = callPackage ./plugins { } // { __attrsFailEvaluation = true; }; } diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 37202bb81467c..02b902bfbcce9 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip" }, "name": "ideavim" }, @@ -36,19 +36,38 @@ "idea-ultimate" ], "builds": { - "233.14015.106": "https://plugins.jetbrains.com/files/631/474316/python-233.14015.106.zip" + "241.14494.240": "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip" }, "name": "python" }, "6954": { "compatible": [ + "clion", + "datagrip", + "goland", "idea-community", "idea-ultimate", - "mps" + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/6954/459286/kotlin-plugin-232-1.9.22-release-704-IJ10072.27.zip", - "233.14015.106": null + "233.13135.979": null, + "233.15026.24": null, + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.283": null, + "241.14494.288": null, + "241.14494.307": null }, "name": "kotlin" }, @@ -69,17 +88,17 @@ "webstorm" ], "builds": { - "232.10072.781": null, - "233.13135.127": "https://plugins.jetbrains.com/files/6981/464477/ini-233.13135.116.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/6981/468089/ini-233.13763.5.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip" + "233.13135.979": null, + "233.15026.24": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip" }, "name": "ini" }, @@ -89,8 +108,8 @@ "phpstorm" ], "builds": { - "233.14015.106": "https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip" + "241.14494.237": "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip" }, "name": "symfony-support" }, @@ -100,8 +119,8 @@ "phpstorm" ], "builds": { - "233.14015.106": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "241.14494.237": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, @@ -114,11 +133,11 @@ "rust-rover" ], "builds": { - "233.13135.127": "https://plugins.jetbrains.com/files/7322/456914/python-ce-233.13135.103.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip" }, "name": "python-community-edition" }, @@ -138,16 +157,16 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.283": null, + "241.14494.288": null, + "241.14494.307": null }, "name": "-deprecated-rust" }, @@ -167,16 +186,16 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "233.13763.11": null, - "233.14015.106": null, - "233.14015.113": null, - "233.14015.117": null, - "233.14015.137": null, - "233.14015.60": null, - "233.14015.89": null, - "233.14015.92": null, - "233.14015.96": null + "233.13135.979": null, + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.283": null, + "241.14494.288": null, + "241.14494.307": null }, "name": "-deprecated-rust-beta" }, @@ -190,10 +209,10 @@ "ruby-mine" ], "builds": { - "233.13763.11": "https://plugins.jetbrains.com/files/8554/454574/featuresTrainer-233.13135.67.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip" + "241.14494.234": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip" }, "name": "ide-features-trainer" }, @@ -214,17 +233,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip" }, "name": "nixidea" }, @@ -234,8 +253,8 @@ "idea-ultimate" ], "builds": { - "233.14015.106": "https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip" + "241.14494.238": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip" }, "name": "go" }, @@ -256,17 +275,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -287,17 +306,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -318,17 +337,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -349,17 +368,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -380,17 +399,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.13135.127": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.13763.11": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.106": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.113": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.137": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.60": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.89": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.96": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "233.13135.979": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "233.15026.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.234": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.235": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.237": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.240": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.241": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.283": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.288": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.307": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -411,17 +430,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip" }, "name": "github-copilot" }, @@ -442,17 +461,17 @@ "webstorm" ], "builds": { - "232.10072.781": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.13135.127": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.13763.11": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.113": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.60": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.89": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.96": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.283": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.307": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -463,43 +482,38 @@ "rust-rover" ], "builds": { - "233.13135.127": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip", - "233.14015.106": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip", - "233.14015.92": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip", + "241.14494.288": "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip": "sha256-H/LRD/5Q9qtYCq4CSonqQcJ4IcdefI/vg2Jlmc0vaJY=", - "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip": "sha256-qbQ2ArW1NcER+LbiVqpB+Sdmi5s78u8jfNmEb+2Nmrg=", - "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=", + "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/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", - "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=", + "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/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", + "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/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip": "sha256-MiF8MVWBEQqupoYyI+QOyXhSvJcoSgptePENByURphI=", - "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip": "sha256-TqcOkgq2tM01VBV4K7daHsIGg4L2TdKqabqJwuJql2Q=", - "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip": "sha256-JpFzBZkv5tXH/TIvXa92VLDy4FDCRt45x6kzmOzzFsA=", + "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip": "sha256-FP6th8J3ymfTrwvJ3Ms7fsNPh3f9ab5ZVg5yPpKV/rY=", + "https://plugins.jetbrains.com/files/17718/517133/github-copilot-intellij-1.5.2.5345.zip": "sha256-BaBYXN8eulaJtJSKrz9bZ2Yn8029goSAUvjYU+BaiIU=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip": "sha256-w0wfdzjekav1uAab2NaZtmTOWDNFz8IxD6Jx0jT4egQ=", - "https://plugins.jetbrains.com/files/631/474316/python-233.14015.106.zip": "sha256-cCTapGg6tjT8usIoqshrhw7Ubg9cYrRGIZiLsiGtT0g=", - "https://plugins.jetbrains.com/files/6954/459286/kotlin-plugin-232-1.9.22-release-704-IJ10072.27.zip": "sha256-3I/wmEkK+iL0VpwoqRlotI+G8G+sqcGN1MCcab+HX5E=", - "https://plugins.jetbrains.com/files/6981/464477/ini-233.13135.116.zip": "sha256-YoFaVOgW0DuyCp/pvcU5ePdnZokrOJZ/SwY6lxnYUOA=", - "https://plugins.jetbrains.com/files/6981/468089/ini-233.13763.5.zip": "sha256-sKeMk4lMeBlu7F/mf3GFRc9RZSVrAlCdRLaQARHfxow=", - "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip": "sha256-tJoqLmhQBsAC/k0H3rNO0/3/Np539KXiZfTMTfvUkH4=", - "https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip": "sha256-KFnMKzybqbLbPVRzRtrUBaNsrel46V2YRmQFc1EecLY=", - "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/456914/python-ce-233.13135.103.zip": "sha256-Yqb3FPG5M5+hNHX3OSEStBekjTjMlf4IV6Yr6+lfoRw=", - "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip": "sha256-yd70cSA/Icn5YlH4Q79cIWGFJ6huYUBDKk6vCIYa3DU=", - "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", - "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", + "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip": "sha256-tBPoO2EkPaWFZ/Gu3UAkZPy4opssWJQEVlz9GZUkNtQ=", + "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip": "sha256-j4b4To8jY4orP87GpphHPtLKeAPDNXcLNSUlIXDDy2Q=", + "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip": "sha256-pQP1LF/6uImQpBOpxUGE8KmmFh26kiC4YaYLAHnEc3o=", + "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip": "sha256-6sTD+OFO/yA7m5o0XqoJKLcQ4zAFro7Iy7WNPfA49xM=", + "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip": "sha256-QC42nC7mEE3X1cmKj8jkwzpDJzX7ZoOPEd9y6i8IuvM=", + "https://plugins.jetbrains.com/files/7219/518876/Symfony_Plugin-2023.1.268.zip": "sha256-mYEuFdSaxw9Lc8yNgPB0ty6mfxjKaAa/jY6v4E2Qo0Q=", + "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", + "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip": "sha256-PUBR9krJ26QrL2jTus0b+uhzkEkT+lGnBKy1f4i/U+w=", + "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip": "sha256-6YC/aoiTRLAh87C2v3k24BLBH/tsdTWuDK/CBv8y1QI=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", - "https://plugins.jetbrains.com/files/8554/454574/featuresTrainer-233.13135.67.zip": "sha256-XgtOrfULS7TJ6yfWOwNX/EL6cEirvVyzMtPzlPJEkXM=", - "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip": "sha256-Hj/CsaQb1U3FN1x2+00Rq2NjC6AWrfuTJL1NiEssfJ4=", - "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=", - "https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip": "sha256-i281TuFtacnu+horAhcHYZy0zV2nRJzSorFBPpC7usc=" + "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip": "sha256-D2gF9bLAEFd1+6vZskiM2Eyl5e8hmyh/VHrmW2NociE=", + "https://plugins.jetbrains.com/files/8607/519418/NixIDEA-0.4.0.12.zip": "sha256-D2HFG2tQy719+baHjUyizoq67tv6lDZrX3s6HDlBRA0=", + "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip": "sha256-66Gx4XFn5DEZ/wCkN7IFQKtp+P0R9PoEAXmwOB97Q3A=" } } diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index 069e70b4253f2..943a7e49e9cdc 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -3,7 +3,7 @@ , cling , fetchurl , lib -, llvmPackages_9 +, llvmPackages_13 , makeWrapper , runCommand , stdenv diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 326d5a32e4b8b..48873326bfcfb 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , gcc , git -, llvmPackages_9 +, llvmPackages_13 # Libraries , argparse , cling @@ -60,7 +60,7 @@ clangStdenv.mkDerivation rec { cling.unwrapped cppzmq libuuid - llvmPackages_9.llvm + llvmPackages_13.llvm ncurses openssl pugixml @@ -75,6 +75,15 @@ clangStdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Debug" ]; + postPatch = '' + substituteInPlace src/xmagics/executable.cpp \ + --replace "getDataLayout" "getDataLayoutString" + substituteInPlace src/xmagics/execution.cpp \ + --replace "simplisticCastAs" "castAs" + substituteInPlace src/xmime_internal.hpp \ + --replace "code.str()" "code.str().str()" + ''; + dontStrip = debug; meta = { diff --git a/pkgs/applications/editors/kakoune/plugins/deprecated.json b/pkgs/applications/editors/kakoune/plugins/deprecated.json index 0967ef424bce6..3834a321e76d5 100644 --- a/pkgs/applications/editors/kakoune/plugins/deprecated.json +++ b/pkgs/applications/editors/kakoune/plugins/deprecated.json @@ -1 +1,3 @@ -{} +{ + "kak-lsp": { "new": "kakoune-lsp", "date": "2024-04-01" } +} diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index fb1287ba490b7..ebdcac8e4dae9 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab, fetchgit , buildKakounePluginFrom2Nix -, kak-lsp, parinfer-rust, rep +, kakoune-lsp, parinfer-rust, rep , fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port }: self: super: { - inherit kak-lsp parinfer-rust rep; + inherit kakoune-lsp parinfer-rust rep; case-kak = buildKakounePluginFrom2Nix { pname = "case-kak"; diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index dce0ad1681066..299c5e06cbd53 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -75,10 +75,6 @@ rustPlatform.buildRustPackage rec { # This variable is read by build script, so that Lapce editor knows its version RELEASE_TAG_NAME = "v${version}"; - - } // lib.optionalAttrs stdenv.cc.isClang { - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; postPatch = '' diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 51b82f266d7a6..33c0c2926fa85 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.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-4ykUdcNwJ4r/4u9H+c8pgupY3BaPi2y69X6yaDjCjac="; + hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index a8e24956fda88..7221e0a6c5178 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage +, common-updater-scripts, git, nix, nixfmt-classic, coreutils, gnused, callPackage , file ? null, gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { lib.makeBinPath [ common-updater-scripts git - nixfmt + nixfmt-classic nix coreutils gnused diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index aa5b007c4d1b3..b29e020cbf612 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack-c, libtermkey, libiconv +{ lib, stdenv, fetchFromGitHub, removeReferencesTo, cmake, gettext, msgpack-c, libtermkey, libiconv , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -121,6 +121,7 @@ in { cmake gettext pkg-config + removeReferencesTo ]; # extra programs test via `make functionaltest` @@ -141,8 +142,11 @@ in { sed -i src/nvim/po/CMakeLists.txt \ -e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" ''; + postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; # check that the above patching actually works - disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; + disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua; cmakeFlags = [ # Don't use downloaded dependencies. At the end of the configurePhase one diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index caa4989e63e82..ce9b091add820 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -78,11 +78,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { darwin.apple_sdk.frameworks.AppKit ]; - env = lib.optionalAttrs stdenv.isDarwin { - # Work around https://github.com/NixOS/nixpkgs/issues/166205 - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - postFixup = let libPath = lib.makeLibraryPath ([ libglvnd @@ -118,7 +113,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { homepage = "https://github.com/neovide/neovide"; changelog = "https://github.com/neovide/neovide/releases/tag/${version}"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ck3d multisn8 ]; + maintainers = with maintainers; [ ck3d ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 3ff760b21885e..391bf102f749b 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -83,8 +83,12 @@ let ; perlEnv = perl.withPackages (p: [ p.NeovimExt p.Appcpanminus ]); + + pname = "neovim"; + version = lib.getVersion neovim-unwrapped; in { - name = "neovim-${lib.getVersion neovim-unwrapped}${extraName}"; + name = "${pname}-${version}${extraName}"; + inherit pname version; __structuredAttrs = true; dontUnpack = true; diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix index 63ba5690df231..5a2e4da2f3ee3 100644 --- a/pkgs/applications/editors/openvi/default.nix +++ b/pkgs/applications/editors/openvi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "openvi"; - version = "7.4.27"; + version = "7.5.28"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-3cqe6woJvJt0ckI3aOhF0gARKy8VMCfWxIiiglkHBTo="; + hash = "sha256-6FP56tlPQXbphyJBDct5hBK81XsU6TJjKDZM4eHqitQ="; }; buildInputs = [ ncurses perl ]; diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index f80e01e1e18e8..b4719dcd4fbb3 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -26,13 +26,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+bQRUTEJluhcs5P87It9/oJOzrCcNFzDJVpixoQKXQc="; + sha256 = "sha256-VEQjZ9kDqXz1hoT4PrsBtzoi1TYWyN+YcPMyf9qJMRE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 8275be235b431..51a1a2925e92d 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,7 +1,8 @@ { lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell -, runCommand, quartus-prime-lite +, runCommand, unstick, quartus-prime-lite +, withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] -, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } +, unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } }: let @@ -18,11 +19,12 @@ in buildFHSEnv rec { name = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ - (runCommand "ld-lsb-compat" {} '' + (runCommand "ld-lsb-compat" {} ('' mkdir -p "$out/lib" ln -sr "${glibc}/lib/ld-linux-x86-64.so.2" "$out/lib/ld-lsb-x86-64.so.3" + '' + lib.optionalString withQuesta '' ln -sr "${pkgsi686Linux.glibc}/lib/ld-linux.so.2" "$out/lib/ld-lsb.so.3" - '') + '')) # quartus requirements glib xorg.libICE @@ -37,11 +39,14 @@ in buildFHSEnv rec { # qsys requirements xorg.libXtst xorg.libXi + dejavu_fonts + gnumake ]; - # Also support 32-bit executables. - multiArch = true; + # Also support 32-bit executables used by simulator. + multiArch = withQuesta; + # these libs are installed as 64 bit, plus as 32 bit when multiArch is true multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; }; diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index e20b86c089f13..12c7039563c1e 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -1,4 +1,5 @@ { stdenv, lib, unstick, fetchurl +, withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: @@ -41,26 +42,25 @@ let url = "https://downloads.intel.com/akdlm/software/acdsinst/${lib.versions.majorMinor version}std/${lib.elemAt (lib.splitVersion version) 4}/ib_installers/${name}"; }; -in stdenv.mkDerivation rec { - inherit version; - pname = "quartus-prime-lite-unwrapped"; - - src = map download ([{ + installers = map download ([{ name = "QuartusLiteSetup-${version}-linux.run"; sha256 = "1mg4db56rg407kdsvpzys96z59bls8djyddfzxi6bdikcklxz98h"; - } { + }] ++ lib.optional withQuesta { name = "QuestaSetup-${version}-linux.run"; sha256 = "0f9lyphk4vf4ijif3kb4iqf18jl357z9h8g16kwnzaqwfngh2ixk"; - }] ++ (map (id: { + }); + components = map (id: download { name = "${id}-${version}.qdz"; sha256 = lib.getAttr id componentHashes; - }) (lib.attrValues supportedDeviceIds))); + }) (lib.attrValues supportedDeviceIds); + +in stdenv.mkDerivation rec { + inherit version; + pname = "quartus-prime-lite-unwrapped"; nativeBuildInputs = [ unstick ]; buildCommand = let - installers = lib.sublist 0 2 src; - components = lib.sublist 2 ((lib.length src) - 2) src; copyInstaller = installer: '' # `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf cp ${installer} $TEMP/${installer.name} @@ -68,22 +68,32 @@ in stdenv.mkDerivation rec { patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name} ''; copyComponent = component: "cp ${component} $TEMP/${component.name}"; - # leaves enabled: quartus, questa_fse, devinfo + # leaves enabled: quartus, devinfo disabledComponents = [ "quartus_help" "quartus_update" - # not questa_fse "questa_fe" - ] ++ (lib.attrValues unsupportedDeviceIds); + ] ++ (lib.optional (!withQuesta) "questa_fse") + ++ (lib.attrValues unsupportedDeviceIds); in '' + echo "setting up installer..." ${lib.concatMapStringsSep "\n" copyInstaller installers} ${lib.concatMapStringsSep "\n" copyComponent components} + echo "executing installer..." + # "Could not load seccomp program: Invalid argument" might occur if unstick + # itself is compiled for x86_64 instead of the non-x86 host. In that case, + # override the input. unstick $TEMP/${(builtins.head installers).name} \ --disable-components ${lib.concatStringsSep "," disabledComponents} \ --mode unattended --installdir $out --accept_eula 1 + echo "cleaning up..." rm -r $out/uninstall $out/logs + + # replace /proc pentium check with a true statement. this allows usage under emulation. + substituteInPlace $out/quartus/adm/qenv.sh \ + --replace-fail 'grep sse /proc/cpuinfo > /dev/null 2>&1' ':' ''; meta = with lib; { diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index db85170f5be16..298f1c2f135e4 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -15,14 +15,14 @@ python3.pkgs.buildPythonApplication rec { pname = "retext"; - version = "8.0.1"; + version = "8.0.2"; format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7zNEmFf0FZCzaNq9EMfGCje66/v5T/QvI5DTftLhi7g="; + hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68="; }; toolbarIcons = fetchzip { diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 82a572eaf4c56..d3ca7de1d6a1f 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -7,7 +7,7 @@ , makeDesktopItem , copyDesktopItems , cmake -, boost +, boost183 , zlib , openssl , R @@ -40,18 +40,19 @@ let pname = "RStudio"; - version = - "${RSTUDIO_VERSION_MAJOR}.${RSTUDIO_VERSION_MINOR}.${RSTUDIO_VERSION_PATCH}${RSTUDIO_VERSION_SUFFIX}"; - RSTUDIO_VERSION_MAJOR = "2023"; - RSTUDIO_VERSION_MINOR = "09"; - RSTUDIO_VERSION_PATCH = "0"; - RSTUDIO_VERSION_SUFFIX = "+463"; + version = "2023.12.1+402"; + RSTUDIO_VERSION_MAJOR = lib.versions.major version; + RSTUDIO_VERSION_MINOR = lib.versions.minor version; + RSTUDIO_VERSION_PATCH = lib.versions.patch version; + RSTUDIO_VERSION_SUFFIX = "+" + toString ( + lib.tail (lib.splitString "+" version) + ); src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; - rev = "v${version}"; - hash = "sha256-FwNuU2rbE3GEhuwphvZISUMhvSZJ6FjjaZ1oQ9F8NWc="; + rev = version; + hash = "sha256-ecMzkpHazg8jEBz9wh8hqRX2UdziOC8b6F+3xxdugy0="; }; mathJaxSrc = fetchurl { @@ -62,8 +63,8 @@ let rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "5175a927a41acfd9a21d9fdecb705ea3292109f2"; - hash = "sha256-c1fFcN6KAfxXv8bv4WnIqQKg1wcNP2AywhEmIbyzaBA="; + rev = "v1.2.0"; + hash = "sha256-ghRz4Frd+I9ShRNNOE/kdk9KjRCj0Z1mPnThueriiUY="; }; # Ideally, rev should match the rstudio release name. @@ -93,7 +94,7 @@ in ]; buildInputs = [ - boost + boost183 zlib openssl R @@ -133,6 +134,7 @@ in ./fix-resources-path.patch ./pandoc-nix-path.patch ./use-system-quarto.patch + ./ignore-etc-os-release.patch ]; postPatch = '' diff --git a/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch new file mode 100644 index 0000000000000..7c67edd16fcb8 --- /dev/null +++ b/pkgs/applications/editors/rstudio/ignore-etc-os-release.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt +index 5f96ffb..3f15687 100644 +--- a/CMakeGlobals.txt ++++ b/CMakeGlobals.txt +@@ -29,11 +29,6 @@ endif() + get_filename_component(ROOT_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + set(CMAKE_MODULE_PATH "${ROOT_SRC_DIR}/cmake/modules/") + +-# read /etc/os-release +-if(LINUX) +- include(OsRelease) +-endif() +- + # version info + if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "") + string(TIMESTAMP CPACK_PACKAGE_VERSION_MAJOR "%Y") +diff --git a/cmake/modules/OsRelease.cmake b/cmake/modules/OsRelease.cmake +deleted file mode 100644 +index 81a9e1f..0000000 +--- a/cmake/modules/OsRelease.cmake ++++ /dev/null +@@ -1,24 +0,0 @@ +-# +-# OsRelease.cmake +-# +-# Copyright (C) 2022 by Posit Software, PBC +-# +-# This program is licensed to you under the terms of version 3 of the +-# GNU Affero General Public License. This program is distributed WITHOUT +-# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT, +-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the +-# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details. +-# +-# +- +-# reads and parses /etc/os-release into CMake variables +-file(STRINGS "/etc/os-release" OS_RELEASE) +-foreach(LINE ${OS_RELEASE}) +- string(FIND "${LINE}" "=" INDEX) +- string(SUBSTRING "${LINE}" 0 "${INDEX}" KEY) +- math(EXPR INDEX "${INDEX} + 1") +- string(SUBSTRING "${LINE}" "${INDEX}" -1 VALUE) +- separate_arguments(VALUE UNIX_COMMAND "${VALUE}") +- set("OS_RELEASE_${KEY}" "${VALUE}" CACHE INTERNAL "/etc/os-release: ${KEY}") +-endforeach() +- +diff --git a/package/linux/CMakeLists.txt b/package/linux/CMakeLists.txt +index 5d5c35e..a94f8fc 100644 +--- a/package/linux/CMakeLists.txt ++++ b/package/linux/CMakeLists.txt +@@ -16,7 +16,7 @@ + # configure cpack install location + set(CPACK_SET_DESTDIR "ON") + set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") +-message(STATUS "Packaging RStudio for ${OS_RELEASE_PRETTY_NAME}") ++message(STATUS "Packaging RStudio for Nix") + + # detect architecture (packaging platform specific) + find_program(DPKG_EXECUTABLE dpkg) +@@ -42,17 +42,6 @@ if(EXISTS "/etc/redhat-release") + endif() + endif() + +-# set libssl dependency +-if(OS_RELEASE_ID STREQUAL "ubuntu") +- if(OS_RELEASE_VERSION_ID VERSION_GREATER_EQUAL "22.04") +- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev") +- else() +- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl1.0.0 | libssl1.0.2 | libssl1.1") +- endif() +-else() +- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev") +-endif() +- + # configuration specific + if(RSTUDIO_SERVER) + diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch index bb4480b4ae5f3..6e0acf46dda05 100644 --- a/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/pkgs/applications/editors/rstudio/use-system-node.patch @@ -6,7 +6,7 @@ index d18362b..98cdd4c 100644 external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang --external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/18.18.2/bin/node +external-node-path=@node@/bin/node # enable copilot @@ -32,7 +32,7 @@ index 033d605..f1ee63d 100644 +++ b/src/gwt/build.xml @@ -87,29 +87,7 @@ <!-- ensure version matches RSTUDIO_NODE_VERSION --> - <property name="node.version" value="16.14.0"/> + <property name="node.version" value="18.18.2"/> <property name="node.dir" value="../../dependencies/common/node/${node.version}"/> - <!-- use yarn from system but will prefer yarn from dependencies if available --> - <condition property="yarn.bin" value="yarn"> @@ -58,15 +58,18 @@ index 033d605..f1ee63d 100644 - value="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd" - file="c:\rstudio-tools\dependencies\common\node\${node.version}\node_modules\yarn\bin\yarn.cmd"/> + <property name="node.bin" value="@node@/bin/node"/> - + <property name="panmirror.dir" value="./lib/quarto/apps/panmirror"/> <property name="panmirror.build.dir" value="./www/js/panmirror"/> -@@ -126,21 +104,11 @@ - file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> - - <target name="panmirror" description="Compile panmirror library"> +@@ -133,28 +111,11 @@ + <isset property="panmirror.minify" /> + </not> + </condition> +- - <echo message="yarn location: ${yarn.bin}"/> - <echo message="panmirror location: ${panmirror.dir}"/> +- <echo message="panmirror minify: ${panmirror.minify}"/> +- <mkdir dir="${panmirror.build.dir}"/> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="install"/> @@ -75,14 +78,19 @@ index 033d605..f1ee63d 100644 - </exec> - <exec executable="${yarn.bin}" dir="${panmirror.dir}" resolveexecutable="true" failonerror="true"> - <arg value="build"/> +- <arg value="--minify"/> +- <arg value="${panmirror.minify}"/> +- <arg value="--sourcemap"/> +- <arg value="true"/> - <env key="PANMIRROR_OUTDIR" value="dist-rstudio"/> -+ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> -+ <arg value="fuse"/> -+ <arg value="${panmirror.target}"/> ++ <exec executable="${node.bin}" dir="${panmirror.dir}" spawn="${panmirror.spawn}"> ++ <arg value="fuse"/> ++ <arg value="${panmirror.target}"/> </exec> - <copy todir="${panmirror.build.dir}"> - <fileset dir="${panmirror.dir}/dist-rstudio"/> - </copy> </target> - + <target name="javac" description="Compile java source"> + diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e3348ceebfd72..e61f57c76448c 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, electron, libsecret -, desktop-file-utils , callPackage }: +{ lib +, stdenv +, fetchurl +, dpkg +, makeWrapper +, electron +, desktop-file-utils +, callPackage +}: let @@ -33,8 +40,7 @@ stdenv.mkDerivation rec { cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/ makeWrapper ${electron}/bin/electron $out/bin/standardnotes \ - --add-flags $out/share/standardnotes/app.asar \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]} + --add-flags $out/share/standardnotes/app.asar ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value standardnotes usr/share/applications/standard-notes.desktop @@ -51,7 +57,7 @@ stdenv.mkDerivation rec { end-to-end encryption, powerful extensions, and open-source applications. ''; homepage = "https://standardnotes.org"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mgregoire chuangzhu squalus ]; sourceProvenance = [ sourceTypes.binaryNativeCode ]; platforms = builtins.attrNames srcjson.deb; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index e71185f3f010b..a7425863d898d 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -1,19 +1,50 @@ -{ buildVersion, aarch64sha256, x64sha256, dev ? false }: +{ + buildVersion, + dev ? false, + aarch64sha256, + x64sha256, +}: -{ fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook -, writeShellScript, common-updater-scripts, curl -, openssl_1_1, bzip2, bash, unzip, zip -, sqlite +{ + fetchurl, + stdenv, + lib, + xorg, + glib, + libglvnd, + glibcLocales, + gtk3, + cairo, + pango, + makeWrapper, + wrapGAppsHook, + writeShellScript, + common-updater-scripts, + curl, + openssl_1_1, + bzip2, + sqlite, }: let pnameBase = "sublimetext4"; packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" crashHandlerBinary ]; + binaries = [ + "sublime_text" + "plugin_host-3.3" + "plugin_host-3.8" + crashHandlerBinary + ]; primaryBinary = "sublime_text"; - primaryBinaryAliases = [ "subl" "sublime" "sublime4" ]; - crashHandlerBinary = if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; - downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; + primaryBinaryAliases = [ + "subl" + "sublime" + "sublime4" + ]; + crashHandlerBinary = + if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; + downloadUrl = + arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; @@ -30,7 +61,8 @@ let ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ sqlite ]; -in let +in +let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -39,31 +71,22 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ]; - - # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" - patchPhase = '' - runHook prePatch - - # TODO: Should not be necessary even in 3 - mkdir Default.sublime-package-fix - ( cd Default.sublime-package-fix - unzip -q ../Packages/Default.sublime-package - substituteInPlace "exec.py" --replace \ - "[\"/bin/bash\"" \ - "[\"$out/sublime_bash\"" - zip -q ../Packages/Default.sublime-package **/* - ) - rm -r Default.sublime-package-fix - - runHook postPatch - ''; + + buildInputs = [ + glib + # for GSETTINGS_SCHEMAS_PATH + gtk3 + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; buildPhase = '' runHook preBuild - for binary in ${ builtins.concatStringsSep " " binaries }; do + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ @@ -86,10 +109,6 @@ in let mkdir -p $out cp -r * $out/ - # We can't just call /usr/bin/env bash because a relocation error occurs - # when trying to run a build from within Sublime Text - ln -s ${bash}/bin/bash $out/sublime_bash - runHook postInstall ''; @@ -116,7 +135,8 @@ in let }; }; }; -in stdenv.mkDerivation (rec { +in +stdenv.mkDerivation (rec { pname = pnameBase; version = buildVersion; @@ -124,27 +144,44 @@ in stdenv.mkDerivation (rec { ${primaryBinary} = binaryPackage; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin" - makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" - '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + '' - mkdir -p "$out/share/applications" - substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" - for directory in ''$${primaryBinary}/Icon/*; do - size=$(basename $directory) - mkdir -p "$out/share/icons/hicolor/$size/apps" - ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps - done - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = + '' + mkdir -p "$out/bin" + makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" + '' + + builtins.concatStringsSep "" ( + map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases + ) + + '' + mkdir -p "$out/share/applications" + + substitute \ + "''$${primaryBinary}/${primaryBinary}.desktop" \ + "$out/share/applications/${primaryBinary}.desktop" \ + --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" + + for directory in ''$${primaryBinary}/Icon/*; do + size=$(basename $directory) + mkdir -p "$out/share/icons/hicolor/$size/apps" + ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps + done + ''; passthru = { updateScript = let script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl ]} + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + ] + } versionFile=$1 latestVersion=$(curl -s "${versionUrl}") @@ -161,15 +198,27 @@ in stdenv.mkDerivation (rec { update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; - in [ script versionFile ]; + in + [ + script + versionFile + ]; }; meta = with lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; - maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + maintainers = with maintainers; [ + jtojnar + wmertens + demin-dmitriy + zimbatm + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d583467ad832c..d77a6205fc208 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -3,17 +3,17 @@ let common = opts: callPackage (import ./common.nix opts); in - { - sublime4 = common { - buildVersion = "4169"; - x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; - aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; - } {}; +{ + sublime4 = common { + buildVersion = "4169"; + x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; + aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; + } { }; - sublime4-dev = common { - buildVersion = "4168"; - dev = true; - x64sha256 = "KfW1Mh78CUBTmthHQd1s15a7GrmssSnWZ1RgaarJeag="; - aarch64sha256 = "qJ9oix1kwWN+TUb5/WSKyHcHzB+Q87XolMOhmqx1OFc="; - } {}; - } + sublime4-dev = common { + buildVersion = "4173"; + dev = true; + x64sha256 = "JEf974X+m0XaZ5x2g4o5XYkdo2A0cIZNjFLCrIgFzEA="; + aarch64sha256 = "+aVV7o59ZFwSOyV0DDNUpaq3q21bXslE+Oz/i33X+4Y="; + } { }; +} diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 5aab7711cf3ee..d33891c37d26f 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.0075"; + version = "9.1.0200"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-rirPSh0rFg25JHl4idADLz6fIRmEALzp2Oa7De6uuGU="; + hash = "sha256-MAMd+k4GpFUwEZzQTWtzSpYY6AEez+FMiqexozYK3Y4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 162bc4a19c657..e73899e66fea8 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -48,7 +48,7 @@ "new": "sqlite-lua" }, "vim-fsharp": { - "date": "2024-03-16", + "date": "2024-04-21", "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 4b34bafdebe6f..48f6720104b17 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-02-24"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "70fcabba2ecb776406bedc4b7c968ea7a876de85"; - sha256 = "1vdqygp8v0j0msyhvc7239fkfvb1m71b3m0fpan9ay2h4x9q0q6i"; + rev = "c74271e68dfc9e125e6ae197879eb50c7b34512d"; + sha256 = "1x2yhdmmm5sbfpqbkrivwa05hx8vk5xa3468db3554clawkp2mnj"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -125,12 +125,12 @@ final: prev: Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "2023-07-17"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "8435bae84b26b602dbb68399661b3989915cc4d3"; - sha256 = "0bsy6mnnz24w35r6sn6gzjzbrkqm7v6wqpd8db7p7fika6l1kzm5"; + rev = "d94dd8f0e34fe230bd84d930f63732619163ab6e"; + sha256 = "1cyd8yysspcw552ws6zn1zpf1dgyhxjr8n8plikr0mh05jzqzv01"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-03-15"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "864c58cae6df28c602ecb4c94bc12a46206760aa"; - sha256 = "07gaiw4xbyqjpw15lry2m4cb42szwmi77dvnkhdj4ii4n7iv749s"; + rev = "bb36f71b77d8e15788a5b62c82a1c9ec7b209e49"; + sha256 = "1vjckraf062d7dybf1iphp7i7lwphzgc1bns0jzfardbd1q9gw3f"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-03-12"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1b1c9f21ed72a12fb7cc430edb1549e83f9b413b"; - sha256 = "0q36mmi3jf1i1z12nddk0zdqla4289pj5mvak9sd79mpi9yrvnp8"; + rev = "d4eded0ab36ba60aa7e13893a2064a74d2cdb6bd"; + sha256 = "0xzdm4ggh5bggnxjgcaxkzdiwfxs11yblgmpwvzqjhpzv8qnzkx1"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-03-15"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "9f74c6a52f4f6adaf3b3d64b15d2363219afefae"; - sha256 = "0kblp05s42n10w5nl56x4mks967na0fljwva387sgympqibwpgws"; + rev = "f7cae6f1b38cb296f48ce1a9c5ed1a419d912a42"; + sha256 = "0mdriqqna37a9fjbilaq2qkkn4ik4jn2dz1x6ra51pgh42r86qhl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-03-04"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "d088ff721ea2f1a56649157fa91771d068f1706f"; - sha256 = "0mxf52vgmk3j6fyymkzrl19lsgdk0jvhx2w7imblsswabqx5xc7a"; + rev = "4556062839aa2e86f2f4f1c0b4532697d607af23"; + sha256 = "14391a213340agjafvraw1az21vj940y7ddwqwbbsrj4q18si7av"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-03-14"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "993142d49274092c64a2d475aa726df3c323949d"; - sha256 = "06pw6ygbmf65zkg65ajy3cr0g3y1fg0lk8kkw2q5f9s2qq2fs306"; + rev = "7045e7cb0017d222122a1f6e5795e69754d8b9db"; + sha256 = "04mclw1drrkr4x4gnb26p6szg6glbkkff7cbrxy4g7fyx6lhl9fy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-03-14"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "712b4b3a9714ff58a5c0798c7b6e0ecf7c59857d"; - sha256 = "1fsnjcw503ca9612q3vjl32q1sq5wyjbiqy2rbwjy2w1cjny7160"; + rev = "adee52fba040428264aee956d99033572fc405a3"; + sha256 = "125hcnl146bh8bpsp3v62dbdqpzwma5n69f8y6gpk5anh4yc1sai"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -689,14 +689,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + arrow-nvim = buildVimPlugin { + pname = "arrow.nvim"; + version = "2024-04-19"; + src = fetchFromGitHub { + owner = "otavioschwanck"; + repo = "arrow.nvim"; + rev = "37f32c94cf6e01826af5d96337c70d2f9be0a280"; + sha256 = "0v23gw86rmciaqbi27ifd3f5mw0vknm2482yznb30dpq3pk53327"; + }; + meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; + }; + astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-02-29"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "903e2cb5d673e35803a6b160e68c1ca4b1c79109"; - sha256 = "1i917mkvdb6zvf90z2iwnl4lyk5vhdqzmgrrbq15447kcjd1z956"; + rev = "8b316aa3ecd8c4206430379c0b1da0b4e7969ab9"; + sha256 = "120fz8z6bmsp7dqjhg8dygbgv1q4bzwk0k8ji55xa2w6bc8ji3ii"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -799,12 +811,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-03-05"; + version = "2024-03-22"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "c572812e1d32c064859d8e9790c05e09f78ce508"; - sha256 = "126ipiv31igbxppgji4p4ahzqgzyrkn08fqn7ws4l6nsm2h75xl3"; + rev = "014e2e2fe51ad4b1a774cffa0f12887767d952eb"; + sha256 = "01aldaizx2madn3a8nis7bnp7r75lvxyvmqcxgy0s7sx8ywkndr1"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -835,12 +847,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-11-25"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "6157dffe86f20d891df723c0c6734676295b01e0"; - sha256 = "0svr1p604ffybm0wwpn8in8nb3clcf28c2iwjvlw1zwvj3a0ldjr"; + rev = "f712bacedb99b862f558540a1d67ec5b7dcee30b"; + sha256 = "13ip7kz9di88cind0c6zbl78bjcmyadlh36fdk1j8zfxilh406s8"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -895,12 +907,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-02-03"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "29a8c77a0579636d5520aebd38bdbc2e6079f2f5"; - sha256 = "0pzbj840xwzgj08zlbs79kfr8p5pfaqmcwmvqvngciaawz5mxwrc"; + rev = "9e0a169b6fce8791278abbd110717b921afe634d"; + sha256 = "0d1rbdsrlprr8dsw948i352c8564hglh56vwg80qxqib2ssfxvy2"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1015,24 +1027,24 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-03-09"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "ca93b6193742f80330ace6d5e4e9f0f0480e0c45"; - sha256 = "1hqjwzn5pfzg46rq316vx83sqyl7fv1y7kk1b9i550zmv7q6qvlj"; + rev = "aaeda8100e3a7ebcc65b5897c9027eca2bd9cbf2"; + sha256 = "1734skv1z9qd8p6dspda1hhq79rd4y4bkyggf0iphz8qw7g0qm8m"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-03-13"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "3c48b5edf61dda21ad41c514e53448fee366a824"; - sha256 = "1fys0jay5ij0xh0sinmyr00z903ksdpcm8cyp6rjwsryrjqda8km"; + rev = "88fe247ba6453b6ac422f26eb047acaac1a6000a"; + sha256 = "0amim3cminq310rzqyylkf7afkyjpmxcvp1y42ml00vdl7av2484"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -1051,12 +1063,12 @@ final: prev: base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "2024-02-17"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a"; - sha256 = "1qb8g6q8vwq99030nqw719xgrizbqcnmj4n25fqakjq8pbclwh4p"; + rev = "eec6882101dd189117f79c5d18d389d20cfc0415"; + sha256 = "060cm7071gr3vpizd7iinpgk50igsqrgcrffa0ali2r6mdhxcwd7"; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; }; @@ -1075,12 +1087,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-03-15"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "6ffabeac88203b6d74afb4be4de5d3daa5dbbda8"; - sha256 = "0048smdfljgxfr7g425m0wxj5whd164r13zrcf2yfzyj7lhb93k6"; + rev = "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad"; + sha256 = "12c3xiv3dxjng86dahz0aw93v62ygqy7pkb3485yjs7a2v6jg5d9"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1183,12 +1195,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-02-13"; + version = "2024-03-17"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "c585fa3b1b892453b1f68df4c52b4f684a7ed7fe"; - sha256 = "17q3dwkhdx74xrxzl3069ia4fl0fj2n8k57s56k59v7f1v1l753i"; + rev = "a41b4f849043dd32188e3d56758d8259e5ff7ae7"; + sha256 = "08sggd2r0krn7kd0qgdi2rdnscp5nzn3d6ihvmy11h2181hi7kwc"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1279,12 +1291,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-03-07"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef"; - sha256 = "1r9bb6jmcj2048ny86v7ha8scjv1qispmxhj98l11jb2xb1f1fvn"; + rev = "f6f00d9ac1a51483ac78418f9e63126119a70709"; + sha256 = "1681xqpvxb7zhfig69d0qf287qzxfwcwb6vipnhykiisd8vn9inv"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1303,12 +1315,12 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-03-08"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "0cc28d53e9da628e006c89bb2d3b03b94a0dee33"; - sha256 = "0gxa73q89w7mkhhmy3f2zdcsys4p9m4z61ff1c9lmbvd1r8dh898"; + rev = "4ed0785a5a812d9dc96164f2ceab10f5dce68270"; + sha256 = "0dpbh9l4a3009k0qi016zm03wjc12jbf31lhj78mmqnpazfn7gfh"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1351,24 +1363,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-03-08"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "f3d9d31aab7990d50ae6922fd7c1e3a9eb7da183"; - sha256 = "0h94gcp1labwgkphd1n9nn9jw1ps4ij2s6pmkdxag8j15kbh3r7k"; + rev = "1283eef5494c092a047baa34ed3e667f3cb2715e"; + sha256 = "1wipfpypa2zjdc2n4cjkiaxcfh0mraiwiripg3vmd4mf37wbxphv"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-03-11"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d2afbb28ed1b6de119fe7c1d4fe248da0819b4d8"; - sha256 = "0gmjs4ms7nxmfd4wyw082mqqgj82309x75yi8rxvnaqyksn70bas"; + rev = "a8271021ec4f5cae4b9a276ab8662e9a7d6074f9"; + sha256 = "0cpzpz17smp3dc4lwid3gkkjwangndy1d6fbijrl1l2jpa8dzrgq"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1423,12 +1435,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-02-13"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "60e6cec400cd857ffd69d582794c3ce5571c0049"; - sha256 = "0mbs4v35v6xwi44dh8isgp66n6x10q6jkvj3ygvpqanwff6bp89s"; + rev = "ea9cb04feadc1f7fbd2902fc65f0308354583f5d"; + sha256 = "0mqnh1155pg0dw07hzn7jd5x42gwvffkpn7w1pk4jnmaas3yxpkh"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1447,12 +1459,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2023-10-15"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "34c8eaa12be192e83cd4865ce2375e9f53e728f2"; - sha256 = "0jfbx2a8yfnp8k1x1c003f1mpvi05kaydla8y07h0lm3nlkdbvr3"; + rev = "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe"; + sha256 = "1qms0pkm1a7mri3bhn3aqy5lis6b1a9x6hwa383z2dp8iqqkcran"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1495,12 +1507,12 @@ final: prev: cloak-nvim = buildVimPlugin { pname = "cloak.nvim"; - version = "2024-03-13"; + version = "2024-03-23"; src = fetchFromGitHub { owner = "laytan"; repo = "cloak.nvim"; - rev = "462e84e1659d984196d09f7d16690b19b9aee804"; - sha256 = "1gg29wngh1cgxpmjvhzg9dx062xklbz87961p81jbpx4m1xsaxwi"; + rev = "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94"; + sha256 = "1bplsykmfg923vrywfw0wi1zjy19lc7impch27kcrawji6g838nv"; }; meta.homepage = "https://github.com/laytan/cloak.nvim/"; }; @@ -1519,12 +1531,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-02-02"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "055d7bb37d5c4038ce1e400656b6504602934ce7"; - sha256 = "sha256-e16I51FbT0itLkyornd9RjShXmLxUzPrygFYVc66xoY="; + rev = "8506c426d5b361dbaa7c61c0490a2589a9c555ce"; + sha256 = "1kmrfbxwzi60mf88qfcwjcwn0js9wci0yz89d99zgrm0vxl5jpkh"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1555,12 +1567,12 @@ final: prev: cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; - version = "2022-11-27"; + version = "2024-04-01"; src = fetchFromGitHub { owner = "crispgm"; repo = "cmp-beancount"; - rev = "da154ea94d598e6649d6ad01efa0a8611eff460d"; - sha256 = "14y2h8g5ddcf2rqwgrrsk8m3j4wmk26vdlqzx439n893dzmzd2yg"; + rev = "1d5b887a33c9ea76798fdd41146c675451cf4e94"; + sha256 = "0nlfs0sjlw4vhwacavmah7gyypj7fi0w8kqcgy0fv515h6zwfym0"; }; meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; @@ -1603,12 +1615,12 @@ final: prev: cmp-cmdline = buildVimPlugin { pname = "cmp-cmdline"; - version = "2023-06-08"; + version = "2024-03-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "8ee981b4a91f536f52add291594e89fb6645e451"; - sha256 = "03j79ncxnnpilx17x70my7s8vvc4w81kipraq29g4vp32dggzjsv"; + rev = "d250c63aa13ead745e3a40f61fdd3470efde3923"; + sha256 = "1sh4ar3ky4qikh2brlwy9nmhy3208fs77ysbgvhccj0lx2krf6c8"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -1699,12 +1711,12 @@ final: prev: cmp-emoji = buildVimPlugin { pname = "cmp-emoji"; - version = "2024-03-05"; + version = "2024-03-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "0acd702358230abeb6576769f7116e766bca28a0"; - sha256 = "1i9ak17cair797fijxd61lnjqy3qykpscah7303arvkxdr8w1zik"; + rev = "e8398e2adf512a03bb4e1728ca017ffeac670a9f"; + sha256 = "1cmvnpqhawhfha89s5ah8v8cpmjykamizjghp5swv191bjv1xn29"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; @@ -1747,12 +1759,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2023-12-29"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "8d8993680d627c8f13bd85094eba84604107dbdd"; - sha256 = "1p7jq14rcljkg2d216498gr0gj76p493vy0h4jzgsz8ncmfxk6qw"; + rev = "b9603f18496bc3ca07e6bd474607081af709e750"; + sha256 = "0r27gf1j77fmqi2m8n5q3s326wp3ns81p7vcfhn6j74y979v11jg"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1867,12 +1879,12 @@ final: prev: cmp-nvim-tags = buildVimPlugin { pname = "cmp-nvim-tags"; - version = "2023-05-10"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-tags"; - rev = "30bdc2eec86eb66730af541bb06d24d4a67e3eeb"; - sha256 = "0dlpw2z9amb4klsr0mjviin73bj7zqfh3lz0g2lwb2n5g6jnakfn"; + rev = "3580b6c97c35831afc25a23f1e7f4aa8ad070481"; + sha256 = "074y4h2p5dx72s7y6spi1iqqpmva3f2mr33pra155ahzqpzqi3v7"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; }; @@ -1987,12 +1999,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2024-01-22"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "a8d76fe729ee2ca6ffc497ebdc2d0f5ddff41b79"; - sha256 = "04yqgb895if25k4h2zn7qr2b0gyq791zq41dqm19c3a4ml7rqafi"; + rev = "d52aae40ee86b62960c31a003352ddfc9e31c8d2"; + sha256 = "155v6pqwdvqnivbm23wx3a554sy5sryb14dd8v01kp3pjydbkqqz"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2093,14 +2105,26 @@ final: prev: meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; + cmp_yanky = buildVimPlugin { + pname = "cmp_yanky"; + version = "2023-11-16"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "cmp_yanky"; + rev = "c3d089186ccead26eba01023502f3eeadd7a92d2"; + sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ="; + }; + meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; + }; + cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-01-13"; + version = "2024-04-01"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "89c4212da7f2a6ce7570ca1b8ed01a95e30585c2"; - sha256 = "00fdqj61av1awq2m3qjkd3znpnc5ywi6abnvyh8xcbs9sbp4iid8"; + rev = "5ee85e0722ccdd8253b6119e7cdd9055010093d0"; + sha256 = "0vxkdys6af38shv75laya871jb3jinhrfsdjm5wdxbxyl4lp39bx"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2191,12 +2215,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-03-11"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "a0f3e2c1b13157a25063b32b49debf46cc96a873"; - sha256 = "1lqd93663nrcbwkhr3a1yyh22zamv38zf3nazxsq36aix4h0v616"; + rev = "a8823eed914f89cdd3940ed9f5f62786e6d585c1"; + sha256 = "1s3hcbhx5kn3b6m1793m02kl94g8hb53jc5lhjhgkg4qhx27hsq9"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2215,24 +2239,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-03-12"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "73ba2a3a41484437ff8a45ca1e796fa9d6fa1153"; - sha256 = "1lcliki38mamk722klb3a0an2bsblx9rsgwixa9f0j7naril4z9z"; + rev = "dfcac077fa023b7194c6403ac9a8f931b9c24f28"; + sha256 = "03lykrm0d5xm8i5f002xfy7l8wmzji5bqy4ygl3vals12ni5ymph"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-03-14"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d"; - sha256 = "13b4nq2z1pw6v0rbmjkxynjs6w4b859hhcnhnsl2r0imhkgss4l5"; + rev = "31dd2962c81759be007895db6ce089feec397c86"; + sha256 = "07ihw108z3lz86f29jqkm9skc4rywqw84mv8gwviaplndpd2z893"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2263,12 +2287,12 @@ final: prev: colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; - version = "2024-03-15"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "e498b2b49d9ad0c3fb8168a02b237b689dcd4051"; - sha256 = "1dxxxdbml12p8awcp78vxj1i2jbhvcdn4m4lnqczxb7qxwpb6g2r"; + rev = "9e96ccd88f4510d0a54ce1d5c11119eac9fb217e"; + sha256 = "1xakrmhsjr5xy82g9vfjmsz2wy93gchsqg7lndvjjm175hsqd27a"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -2299,12 +2323,12 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2023-11-17"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "b8bcea8d40866bfa33a7f7b24979781039bfc76f"; - sha256 = "1jiqpgz31whbplv1hs10y8ais5vgya8sz86ahfrbj4c3w34sxvry"; + rev = "e4618dc08695fbf3a1171f12e0fc803ac4a3a19b"; + sha256 = "0x1wh6v11nnmi1xfy6qk5bb3riindigxnmyi407pfpb14acvl51l"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -2381,6 +2405,18 @@ final: prev: meta.homepage = "https://github.com/tamago324/compe-zsh/"; }; + competitest-nvim = buildVimPlugin { + pname = "competitest.nvim"; + version = "2024-01-23"; + src = fetchFromGitHub { + owner = "xeluxee"; + repo = "competitest.nvim"; + rev = "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5"; + sha256 = "16mycxnxa425rnl1xdk740ng6mg693ywzx5wsa56xr8nvxkms700"; + }; + meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; + }; + compiler-explorer-nvim = buildVimPlugin { pname = "compiler-explorer.nvim"; version = "2023-05-29"; @@ -2467,12 +2503,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-03-15"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "67ee2258e08ccb91345d52f62484b657feccef25"; - sha256 = "0d76rrjbmi3rmvm27jh61zs35z9axc5l6yacr3yrrnfi0kahi0fy"; + rev = "a6965ac128eba75537ec2bc5ddd5d5e357062bdc"; + sha256 = "00knvdl5msvn178skxqxb0ip722cnqrpp8xr1id4z6j5vbysmhiy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2540,12 +2576,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-03-14"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "9484e35cf222e9360e05450622a884f95c662c4c"; - sha256 = "1c7dabbyk5124xw5k5b29h9nmv04ix6p3j3p7qns7ssqinvfphmm"; + rev = "1e135c5303bc60598f6314a2276f31dc91aa34dd"; + sha256 = "06b5c0xgs3xiajdw7ag3qbv4i0qwn4s084r4pj5v8d9iyc834kiz"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2564,12 +2600,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-02-03"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "d9c1492ee60d627b171c7a9bcd0c3bb35af3e0fd"; - sha256 = "0q8fv58v2sy9kq737ddmrrf0vvqpz8wrybnrks3vazq017jc5y7v"; + rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397"; + sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2588,12 +2624,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-03-11"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "a290446adad540d780e87d7fa8ef86bb2fdc2951"; - sha256 = "1z8icxpxv03yiigav70r5v463pj5n5v5lq6czwpq2x51pxkaznym"; + rev = "98e389717df1a29f557f7a5d8f1d8a7e5c0560dd"; + sha256 = "16ngidw3lg1virbd731pp9z1s20j8mva6569blkj7cnk08kprh7l"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2624,12 +2660,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-03-13"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b4f4987ccdb1cc3899ee541ef4375c73c48c4570"; - sha256 = "0r9l018sfymmbg7lc31bp4q2aqdljaqini5s14mg3r7lwcg15z61"; + rev = "786d12a70c9b91fa2d0d102bb07df02be0db31a1"; + sha256 = "1krd7srvzjrikpirfypw09cv2flcy22jv8amrbxfxykrgg2vn6dd"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2720,12 +2756,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-03-09"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "7ad27cf30a2aeeaefb8e4d25a9ae7c06bd4ce299"; - sha256 = "02nqql0bw4d3izvxi77ml7akkhi6ihgs3ra998zb4c5kf1mcf5nw"; + rev = "9a7f07ad318a96f19845683014d27be00495ea98"; + sha256 = "1w8ic8ngfk1x99yl7bx7kfqmwi0py6xj198yczvxwzmgfxby5sjc"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2756,36 +2792,36 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-02-13"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "413442b12d85315fc626c44a0ce4929b213ef604"; - sha256 = "0pdq7c34093a7p92kqs9pkipj91q45j4y4djlik69fmdxi1kcbxy"; + rev = "6d06924b562de6f0bb136edf1bf549afbf6b7d00"; + sha256 = "1c5xhwsj84rs00zds9279wfvxc2xjmdfix36mvxdklrq6f083ifd"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-03-05"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "39d21298151dda8bfab537ae7741528cffe07aa3"; - sha256 = "0ah84grvp1j8nvrv5rj6l63vw5d0d6678dylv91dmd78rfdwna7g"; + rev = "4ac809ff035eb246392ce4593c49705e894dbbea"; + sha256 = "1zjycn3qj6mpa7c5aknka2dfq8d05ac8rc6sfh81sal2hwdnq1d1"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; deepwhite-nvim = buildVimPlugin { pname = "deepwhite.nvim"; - version = "2024-03-12"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "Verf"; repo = "deepwhite.nvim"; - rev = "fe78337404c36f48ef0824ad1bb43de3bb4211bc"; - sha256 = "0jxkjm83fgzjhgid57aj92775gdcy6ag280h8img2zjfnq9kgh27"; + rev = "264cf7a2e881b806edd379342cffba3da38fbc07"; + sha256 = "1xjqqvn7ijc6gcifm972gflx36zf542wqyphs3hkxyx0h2ngfix9"; }; meta.homepage = "https://github.com/Verf/deepwhite.nvim/"; }; @@ -2876,24 +2912,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-02-29"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "b5dfcbc249a7559cbdc08ba1b7dc1cd92dec6d98"; - sha256 = "1avngb6fz152p482v0mrxqy60prv54hzsxp123bwvs4m8d4xfsb9"; + rev = "c727a3f05a804d1f04b11735f8241518465de9a7"; + sha256 = "1h08jrxa07b59ipxqlk2ni78bn1h2w4qdg0m46bwgn7pb24479f6"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-03-13"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "8ac4d600ebc51565cb1fa5c045e8e71e2eeaa009"; - sha256 = "1pak5m9aicnqw8akc2zbh3aqmq0rl5j7m4xidh2h5hm5xnjidp9x"; + rev = "c77537a563a58221eb996ea64304dbe22ebc6f64"; + sha256 = "0gnrx5ll1hmpxsn5jw229w8sa2kkswyw6bdd1ffgx7bvfk7z2k4m"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3274,12 +3310,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-03-08"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "f1034cfe852cf62a0ebb12ae583f1477ea07e060"; - sha256 = "1f9fd6m31xjkf6rhi05p0cxdx7xp3lpfg13yasaaabasxqwz92sz"; + rev = "e3c7de9f733587373959b220d5a1970c476a3d9f"; + sha256 = "02ipdrrian2s0ddbjaga681sgflcw6nqcq707g7v1f094fc2rvj5"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3298,12 +3334,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-03-02"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "86af25173e7e0d43c70f6621305c2b816635c4bf"; - sha256 = "1xdkz51z7cxy55j7s0hvv3jyk61nwn4d21lf3y2yf5z87wnzl604"; + rev = "4e2eee9fbbad1c8fdcad8acda979d3828aee538d"; + sha256 = "14a67viw948pln2avpkcanq3b8pb324f69h2np5yclb7fpijy0qr"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3322,24 +3358,24 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-01-21"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "0b35dc6da4cae6cc2f724bc610eadf955cd2319b"; - sha256 = "04dv17nvgs1fwfphz1vqk39nqlrq77215077a9sq7x7ligpc87lv"; + rev = "de79b7d92a5979cd71a9a1d8b6282515345e5055"; + sha256 = "0z5mb5cnwdpcswy3w099vyfjz0hmb04j4vbkgxnc8g9y6lffn2rs"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2024-01-15"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "0956bc257ca4eaa3e087e0ba2253a3e980805820"; - sha256 = "1w64bpv4hanyxml0hbqqsbm96fckx1imcvksr2raq9al0qlfk4gn"; + rev = "8b7da79e9daee7a3f3a8d4fe29886b9756305aff"; + sha256 = "1ix80rgylpjimv3x13f8nf3gs33lf99wzydswyzyd5mpvz5p8i55"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3359,24 +3395,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-02-11"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "a61c52d325835e24dc14ffb7748a32b8f087ae32"; - sha256 = "0y145z35y5x1frnaw1s9nlap1sjm3gk0fzcgwp0xskmfhcm8b55r"; + rev = "2bd059ef683c232f9d6fa898bfe93173f0d4253e"; + sha256 = "1phyrapplsn5iivl1vfnvg4nfilxdp8digcfy6d9khsbpggjhcmq"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-03-11"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "4d003f4b41ab9b4f8b569104fa7818f048ed4e25"; - sha256 = "08qz9azq1m4rfw8s2sd6hhrds5zx0vv2azyjnwyk05q2v95xwl55"; + rev = "3c4f8344a341818417b3d75c04eb96d894cb4640"; + sha256 = "1jwqflzdr9qk27gqsd0h4nfi2scq274l2rgbmyccybj5kmdjv654"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3444,24 +3480,24 @@ final: prev: eva01-vim = buildVimPlugin { pname = "eva01.vim"; - version = "2024-01-10"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "hachy"; repo = "eva01.vim"; - rev = "8ab19cfc230806a5ce0ed8f3f75c990c78a949bd"; - sha256 = "0bh2y5afi875b1p3h6lgz4jiszajv61fi14qns6n86n8zamqc3fl"; + rev = "93ae0d296459ed124c288990001848b3956339fa"; + sha256 = "166i51ic1xnp3lxmipa7sgrwcfcma30sc66ymg96dccrv0p3k0ig"; }; meta.homepage = "https://github.com/hachy/eva01.vim/"; }; everforest = buildVimPlugin { pname = "everforest"; - version = "2024-03-14"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "4c7fef2eea3ad22958927d6d1b261b4f2c2c384e"; - sha256 = "0dbs7y4xdlgaqzbrn0ang9yshma3l3i4wd0ffmcczh4sxbsis5b6"; + rev = "4d67edd8d4701b00cee37073d53053a650264541"; + sha256 = "1jlr4wjbmzjgr823csai7ii3yq2gppl8kchhqngp76gpf4i81795"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3540,12 +3576,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-01-05"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "6cfbe0608d2552a7d947c6f521670b10379fbe42"; - sha256 = "1hkypnpaws9ijw4k3gqc03y5hmwnjp9jax8k9dxgqiasixk0wqs9"; + rev = "2aa8b757313cc01f7779865bef7c7cc391753bd8"; + sha256 = "1xbaa553l7hc2jfgdj9q44xxgv8bkia51w54297p548w90by3kfl"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3564,36 +3600,36 @@ final: prev: fern-vim = buildVimPlugin { pname = "fern.vim"; - version = "2024-03-16"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "00faa2cd9a0efad9d23f362141f73c786de3389b"; - sha256 = "0g3akjn2sz9hs9sq138d9yj30g3lynbca79yhk9vfxbs9s1cgzdl"; + rev = "928d355e4c06e08eb3c9062485a661f1d37b01d1"; + sha256 = "1siyqx08cb36dh61gy7hgmv0csdjbxnyam07is52w1x2pik0167h"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPlugin { pname = "ferret"; - version = "2023-10-08"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "343b6934e9369d10d64c25642586dfdbab01bf45"; - sha256 = "0yam4066mkhndpmv1d1icql8fi7fzjv8p1gg7vnjnkzizcgprw8k"; + rev = "0190acf27440d9f5acd67582bdb1a2b55f31c51a"; + sha256 = "1szr5a9zjkjxbh0749p6f4x6319by3jbzy50zy0rrx0jqb4pa1js"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-02-19"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "60404ba67044c6ab01894dd5bf77bd64ea5e09aa"; - sha256 = "16wf6jk18r5grg0l0pqmq45nkchj5jdbdqil5v1jrvwpf7d37yki"; + rev = "1ba38e4cbb24683973e00c2e36f53ae64da38ef5"; + sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3612,12 +3648,12 @@ final: prev: fileline-nvim = buildVimPlugin { pname = "fileline.nvim"; - version = "2023-08-30"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "fileline.nvim"; - rev = "64fc4b24f559467ff7fdbf4b3d9eaf4724f331e4"; - sha256 = "0q68mz6kd3zbf2blwz84q39wn2kq9svl8516p5vyn9jpn70rnmgv"; + rev = "c116aa8dd7aa7e1db6938f872285e598dc9ee00b"; + sha256 = "0l8xi023mplbxbsg2h9lrcm2pfxrrnkmp9dx0dmq2q6c39vcazin"; }; meta.homepage = "https://github.com/lewis6991/fileline.nvim/"; }; @@ -3661,12 +3697,12 @@ final: prev: flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2024-01-26"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "92c59ae6200e6b04aff167577ebb8a9035a6d2b3"; - sha256 = "18sq9bh5l60nfxhc1glgn6nc35089hvp9vgkqp5s5ridnibf77z4"; + rev = "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d"; + sha256 = "0cakkw66sw6g5s0cj5smdbfbd022rs2xgkfc56krkbyqh0midawr"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3685,12 +3721,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-02-22"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "94419242ba07170b0009514d745e617b120964f4"; - sha256 = "17zzabbn5f7sk0sq0j4df15jmy3q30j851gxzwf2ahrwbzh2v36z"; + rev = "56490317983218b09698f8c960c3669958b12b32"; + sha256 = "1m1l9dh7gwphf7ry7wzvx1hrha3i9b5alp6kpazpjidnjr1mjzb9"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3745,12 +3781,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-02-19"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "01d72d9c1bdf2d454a60c5ba450f83e5ea783f6a"; - sha256 = "13xw7vh9ad6ipldxk7q48fd8gwfr88i1n0j3ny18mz3cwg1mldzk"; + rev = "f04131d6b2c82c2a7624a8843642d6269b50b437"; + sha256 = "0i8nincmm9jnq36hhgmygq2101993mabya61mmjgpcf96dl1mdwj"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3769,12 +3805,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-11-28"; + version = "2024-03-18"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "cb4778b8432f1ae86dae4634c0b611cb269a4c2f"; - sha256 = "07mr1sl8gwxcwkazgjv6zpbk2r0nv51al2ksmcd740bb4g1xgr0b"; + rev = "ad246d34ce7a32f752071ed81b09b94e6b127fad"; + sha256 = "0qjcpxm0q9667wi0qm1bh4pyi1jyp7s5ns0p3arcknfgygr9mlm4"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3793,12 +3829,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-02-25"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "dcd4a586439a1c81357d5b9d26319ae218cc9479"; - sha256 = "10326d83hghpfzjkbjy9zy9f07p2wvhl4ss92zfx2mbfj44xg3qi"; + rev = "ea068f1becd91bcd4591fceb6420d4335e2e14d3"; + sha256 = "172lhjssr4yh14vjxbkwx02hsnyykhqmvzzr1bx4aaawd22x0bz6"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3817,12 +3853,12 @@ final: prev: fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; - version = "2023-05-22"; + version = "2024-03-18"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "55fed481c0309b3405dd3d72921d687bf36873a8"; - sha256 = "0y1gkbnihinwi4psf1d5ldixnrpdskllzz3na06gdw0hl4ampq60"; + rev = "e8dd4c9dfe8ce43503dd81286d4e80f65a978e71"; + sha256 = "0g0mq8k8014slh9326c37fkhyx5ajmm3gzlf7aln6krqb6nh8vj5"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -3901,24 +3937,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2024-03-15"; + version = "2024-04-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "a1d6608b6ba5309f9abda776398c97fe8ed26c11"; - sha256 = "1njnbjyi8n4sgs3zpl1hcdi237crp9x5h52fxwnv3j8nxnbai5kj"; + rev = "5a44f0ace88de57743af661c9507ef5075aa6e2e"; + sha256 = "1r9bi2a56gg827s9a0yk6skm85jl0x4ky1qk2ram4aaxpjfc2c6y"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-03-11"; + version = "2024-03-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "e69f2dcdad44e7eafe764969ed7281d7290db18f"; - sha256 = "0c9p6qyq4wfvvkmgn77nkppwfqnr1si2xzcwlgmmp1vvfjdmam7m"; + rev = "45d96c9cb1213204479593236dfabf911ff15443"; + sha256 = "12jr0svh80q6wchg59c4gwqgrbf1w9p1v3xdx4djs5vbshcdpxyc"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3949,12 +3985,12 @@ final: prev: gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; - version = "2023-12-27"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "382826e8b6fa99a700df9ae23f1fa0f9bff1c53c"; - sha256 = "1jd1i73h87hhfmhcpj4wm0zxjga9f1l0xxpnrjgw9vxnmvk9criv"; + rev = "2bbb23d32d0546e78e7ecc3b310951b86c781780"; + sha256 = "0h8mvs7wfi16qb33l85p0jxznmwij6jqhd0nhg8cqiycz2632pbs"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3997,12 +4033,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-02-29"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "a0282d05adbee80aaf4e2ff35b81b52940b67bed"; - sha256 = "0r678sln1ixgwby2kl6z344iq3dq2xpkyilrq2zpdrq4gfjhmanx"; + rev = "ad1d1365c9189d89797fe8d559677d5f55dc2830"; + sha256 = "1saw496nx8pimq1sn0ws2k10cvwg4r5q5dizfclm1rpxfp13485j"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -4043,6 +4079,18 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; + gitignore-nvim = buildVimPlugin { + pname = "gitignore.nvim"; + version = "2024-03-25"; + src = fetchFromGitHub { + owner = "wintermute-cell"; + repo = "gitignore.nvim"; + rev = "2455191ec94da8ed222806a4fe3aa358eac1e558"; + sha256 = "sha256-p6k0NP3Vne6Kl98YodzSruVmJwxyrXziJj8N7u79o1w="; + }; + meta.homepage = "https://github.com/wintermute-cell/gitignore.nvim/"; + }; + gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; version = "2014-03-16"; @@ -4069,12 +4117,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-03-13"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "4e348641b8206c3b8d23080999e3ddbe4ca90efc"; - sha256 = "0apzslpij9sq7h0rpilvgrn5naqiwrz69x5g5n7m82pj9pz0d2m5"; + rev = "035da036e68e509ed158414416c827d022d914bd"; + sha256 = "1k5qd4k7izirgvc8yvg1hjgfx00f9fml7k0ayzk45lnhzb5c7bah"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4093,24 +4141,24 @@ final: prev: glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2023-08-26"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "8ed5cf3b3b1231ea696d88c9efd977027429d869"; - sha256 = "0r2n9q687dvsc5w06v4a90cjcpi0gvjigjf9j27b864m118xj9x3"; + rev = "51059bcf21016387b6233c89eed220cf47fca752"; + sha256 = "189si3pw3cri28lfkfs7p79wrkrnm043shx8k8frirpgsjz9slv6"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2024-02-24"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "d2f6d0b0399ab6d76b4a17b77ffec590fb2ec1c2"; - sha256 = "1pimv8cj4a1avxhnv687a9dlf0lvpny9q588lk8xr2dx1fxkcm2a"; + rev = "f9e82b70425dc0726ee173ecddf176ffa364e30d"; + sha256 = "1z4vvrxddhncfnr14a7kqc2k6gwknx8ydvs6n4my0nkz9jxh3v6s"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -4129,12 +4177,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-03-14"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "9ac3e6faa32d01479973f4ca368d00b7ae328646"; - sha256 = "0rllids06cgfb6hwgacqss7mnmvbrna2h0qwic0mslhg1m8wkq96"; + rev = "cbc6aca611cdc664f9bfc3c0a9aa9f9912fa9720"; + sha256 = "1a1a7ddg70l74ngwwrygg5r39h1yzwws0myzy5jk837lmr909sb1"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4177,12 +4225,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2024-02-17"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "527fd81a827234e26ca47891abe90497215db2a6"; - sha256 = "123gbz6313b0qz2ydzv1gi4nlv9a1p0lg2ywp0p365lx3684nqfg"; + rev = "3552fad4a0244ffd9ac86508e29ccc5166f19eb8"; + sha256 = "1a7dbzr3sgabcidwls7mnjbdbhjqayh1xfxwhl96ml3cqhari2k7"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4223,6 +4271,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; + grapple-nvim = buildVimPlugin { + pname = "grapple.nvim"; + version = "2024-04-11"; + src = fetchFromGitHub { + owner = "cbochs"; + repo = "grapple.nvim"; + rev = "12172536620464f8cc124e07c6e3ccd306ea3c5c"; + sha256 = "0rpiq47zb0ms6bbbd3c1ywmq5vc88132xcqwfnbfn3d2hrvbz8d1"; + }; + meta.homepage = "https://github.com/cbochs/grapple.nvim/"; + }; + gruber-darker-nvim = buildVimPlugin { pname = "gruber-darker.nvim"; version = "2024-01-08"; @@ -4247,6 +4307,18 @@ final: prev: meta.homepage = "https://github.com/morhetz/gruvbox/"; }; + gruvbox-baby = buildVimPlugin { + pname = "gruvbox-baby"; + version = "2024-01-25"; + src = fetchFromGitHub { + owner = "luisiacc"; + repo = "gruvbox-baby"; + rev = "bd52e62d8134647090108189e69c8b3cd18bdbbf"; + sha256 = "17wnc3zpxki0fy8fbkinj0jvf6hnkz139x6yrg7hmj97aa8rh4sj"; + }; + meta.homepage = "https://github.com/luisiacc/gruvbox-baby/"; + }; + gruvbox-flat-nvim = buildVimPlugin { pname = "gruvbox-flat.nvim"; version = "2023-05-27"; @@ -4261,16 +4333,28 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-02-10"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "b17fe51688b76e2ccf118e5f76f3978b9a8c503e"; - sha256 = "00yd2gwv71rbnkyq1ldg1jgwp6np994yr3sfvykjxjc98p1lsmfn"; + rev = "80331fbbec9ba18590a17bc6b7d277d96c05c2b6"; + sha256 = "14m7qwckgb6gc60gk0gr5pax3agxbs7c516pv6352nkrc2cdpakb"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; + gruvbox-material-nvim = buildVimPlugin { + pname = "gruvbox-material.nvim"; + version = "2024-04-19"; + src = fetchFromGitHub { + owner = "f4z3r"; + repo = "gruvbox-material.nvim"; + rev = "9143e172617e708d6588f424772ef20340877dd9"; + sha256 = "0ad1s2l7vd9h2ycva5wwxisadsiqlr55pfjas23cra8gw5ngn9cj"; + }; + meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; + }; + gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; version = "2024-01-29"; @@ -4345,35 +4429,35 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-03-14"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "fd61b2623f72751d661d9e2a22beeac2d561dd1d"; - sha256 = "0kkzcqwzi5lig6kv9zp4sdncnx1qnwlkvw0lnsckq4xnp2x1dd92"; + rev = "ad39b73b07aab7d1f48a624ba6f3ae35ad0a2e56"; + sha256 = "0fpn0sif0y7xrp8f01fkz0qq0c29l6r5shc6q9bvl32dzp7n2ryp"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-02-03"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "860e912895176112868c97b46277f547e149f5e6"; - sha256 = "11pj5lx5k5db66jkm7avkh2nmdqym09ipxa8ylq98d0cqzk8pd8z"; + rev = "eaf4bc31b86419c26ad7b3a142dd36ca545ca2e4"; + sha256 = "0z2ppcfqd9zkhmr8xkckq7a7a8pjgma0f6jyyzg83yb3f4443yhw"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2024-01-08"; + version = "2024-04-21"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "9abf570deb82ecc525a53e0b96b487efde8bc490"; - sha256 = "0pnkz6n48b0i56vilg81c9p7z3bj834r7vch7b53cmmpp78v8ikf"; + rev = "960c7a342609f373414c1e7fe4be0dcc369716ff"; + sha256 = "1dzpp050gl1a39vdmn57941qzxmyws0x1fqykq82babppn23hzpb"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4404,24 +4488,24 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-03-11"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "66a7525706b03a730accab3f706d3f0f8078569d"; - sha256 = "0nh1f1ajd25lrw3y7pp013586gx6vklqfqai8z6lgk7dfzm9cpcj"; + rev = "89a4f683b83a656e6ccb4ad0db97ad8863037f5d"; + sha256 = "125drbzxbqv6hlpbplhzh5caim612mz6pmgw05bja2vr1cjpwsg7"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-03-11"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "d8b57f073d844380a7f18c65227e5ce7cb6bc325"; - sha256 = "02w9982qimq4xi79l29n3jky9pgqrfisfff4fxv485gz5hnl65hj"; + rev = "4fdb49333093c0a8aae35cfac68e71cf595666ef"; + sha256 = "0qgrkxmqzlp1z5zxkdzy37lwfc7y3bpqgiy17hxszdrjy6n44vih"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4583,24 +4667,24 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-01-01"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "6d853addd6e11df8338b26e869a29b36f2c3e893"; - sha256 = "0h7dcrqyb5d67pxg4pmky4cw3qhl1z8z217nxnkvrwxfdl0khwn8"; + rev = "059e88e9dcaad3280ea1fd5c757f6904f274aed5"; + sha256 = "1m5li7gy18d4z2fzzm6ipghn67m2i9a5fq7v1l6qy3vxgh9vzrq7"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-02-21"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "b18d3d82e8545d9f765870c1d8f0da041bd61097"; - sha256 = "1jb2wbkrx4cdncwz991lxhgvfsqkx6zq004ig7jpw8hbkxd6db3z"; + rev = "5c96b423a6663c91c47d6184f810acf1dacf4615"; + sha256 = "136jawqxirrs130ka15hnbwlgplrkisahcv91v4avcbr46rx09d6"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4619,12 +4703,12 @@ final: prev: html5-vim = buildVimPlugin { pname = "html5.vim"; - version = "2020-08-22"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "othree"; repo = "html5.vim"; - rev = "7c9f6f38ce4f9d35db7eeedb764035b6b63922c6"; - sha256 = "1hgbvdpmn3yffk5ahz7hz36a7f5zjc1k3pan5ybgncmdq9f4rzq6"; + rev = "485f2cd62162c81e56d8604b4c630f0b5ef69d1f"; + sha256 = "0j012i6nklc4p92cbh3l1zqs850plxh847b52lskb533rhygx9kf"; }; meta.homepage = "https://github.com/othree/html5.vim/"; }; @@ -4677,6 +4761,18 @@ final: prev: meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; + idris2-nvim = buildVimPlugin { + pname = "idris2-nvim"; + version = "2023-09-05"; + src = fetchFromGitHub { + owner = "ShinKage"; + repo = "idris2-nvim"; + rev = "8bff02984a33264437e70fd9fff4359679d910da"; + sha256 = "sha256-guEmds98XEBKuJVdB+rQB01G+RmnQaG+RTjM6smccAI="; + }; + meta.homepage = "https://github.com/ShinKage/idris2-nvim/"; + }; + idris2-vim = buildVimPlugin { pname = "idris2-vim"; version = "2020-11-26"; @@ -4691,12 +4787,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-02-27"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "0dd8bdbb8855bc98c534a902c91dc9eddb8155b1"; - sha256 = "0gcnssnqfzk9d0gjw3mvviv3n1f54bqnqirn78gsv0268pibb82x"; + rev = "301de7919b2c0378cb7a782663f67abbcb198b17"; + sha256 = "0cxqffdync3hfg7xfahwnsd5rwz1gd2mqcgsgm615qbx364as8d9"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4713,26 +4809,38 @@ final: prev: meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; + improved-search-nvim = buildVimPlugin { + pname = "improved-search.nvim"; + version = "2023-12-21"; + src = fetchFromGitHub { + owner = "backdround"; + repo = "improved-search.nvim"; + rev = "9480bfb0e05f990a1658464c1d349dd2acfb9c34"; + sha256 = "sha256-k35uJZfarjRskS9MgCjSQ3gfl57d+r8vWvw0Uq16Z30="; + }; + meta.homepage = "https://github.com/backdround/improved-search.nvim/"; + }; + inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2023-12-28"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "6f9b5f9cb237e12935144cdc535322b8c93c1b25"; - sha256 = "0br4asqmypyfmczg0yp32aga8amxzy0d2rzbg74ip1p6npai5fmn"; + rev = "5e03e986625961d1fac296d1bf332a6510c3add6"; + sha256 = "0zcii0ypqv66xmy4w964kry4zij87fx9mckxifck0xy1y79ncp7r"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; increment-activator = buildVimPlugin { pname = "increment-activator"; - version = "2021-09-16"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "nishigori"; repo = "increment-activator"; - rev = "55efcff88be45bd98cfdf7333dd718399373d10c"; - sha256 = "0q8990q9yxc85h69hssk4lry01qiqyi0hlnnx8l1kk218yar4q6h"; + rev = "b49fc24094f93aa29a7592034b97095b709c3528"; + sha256 = "17kcq5hbgyxa8yk1qzqabd8k0255vdcn4kcijikl4kgv4cba6xwa"; }; meta.homepage = "https://github.com/nishigori/increment-activator/"; }; @@ -4883,12 +4991,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2023-07-13"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "7f876ee3e1f4ea1e5284b1b697cdad5b256e8046"; - sha256 = "0yf7sykk6dvzmnzwphfmi3s3jmr9iab1aqszx6ir5915zy3wrwvl"; + rev = "f6f199e3d353fc5761e2feda63b569a98897c66b"; + sha256 = "1bwqval3lr12cqivfmmvxdi6da07000xbsn2ygiz4ym1a0a9jg5v"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -4990,6 +5098,18 @@ final: prev: meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; + jsonfly-nvim = buildVimPlugin { + pname = "jsonfly.nvim"; + version = "2024-04-19"; + src = fetchFromGitHub { + owner = "Myzel394"; + repo = "jsonfly.nvim"; + rev = "e47fd7713b083120af6cdb1548de8af513a0ec6f"; + sha256 = "0wnjzqx68kqwza2pnaazmp1l986pys86ncj8hrdfcp4nvmz2i3xv"; + }; + meta.homepage = "https://github.com/Myzel394/jsonfly.nvim/"; + }; + julia-vim = buildVimPlugin { pname = "julia-vim"; version = "2023-12-15"; @@ -5002,6 +5122,18 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; + jupytext-nvim = buildVimPlugin { + pname = "jupytext.nvim"; + version = "2024-04-05"; + src = fetchFromGitHub { + owner = "GCBallesteros"; + repo = "jupytext.nvim"; + rev = "c8baf3ad344c59b3abd461ecc17fc16ec44d0f7b"; + sha256 = "1lz8ajcy9gm02bwgq5rr5ppx4g1irzvgx074mqmbv7xawij5241c"; + }; + meta.homepage = "https://github.com/GCBallesteros/jupytext.nvim/"; + }; + kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; version = "2024-02-28"; @@ -5112,48 +5244,48 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-03-13"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "d60bc498c9d1d890e8aa4257c784f5103a2d1f13"; - sha256 = "1k484kfwznq93fk7sqin8767knjfv4anb7vig7ihambvdcd1l74b"; + rev = "19d2a4de3a57deed4aab304704c1f5e77454f4f3"; + sha256 = "089drz8djyhsksi19ixcpfnci7ag121gsj17cq2a91l8m430j0y4"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-03-07"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "83493db50a434a4c5c648faf41e2ead80f96e478"; - sha256 = "0p9ssd6ja90a90vckhpr4xbf0sfa62yrmmc30jbxln9wxqaylcaw"; + rev = "31ddbea7c10b6920c9077b66c97951ca8682d5c8"; + sha256 = "0yb46njab5jid29fx6cl6and583pmnhysz637b18xcil5x0my8ik"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-03-01"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "774dcecbd0b9b57be6c150adacb60ced79b11b23"; - sha256 = "1igxh03ryxa86h9qh4fgnxqfmys61fmagclm8yryr0bwdk78mjk7"; + rev = "0ada6c6e7e138df92f5009b6952f4ac41248305a"; + sha256 = "1jc8s1gwa1xzlvk5ysarhbm8ywz1hc5kfbdfxvqbl8bcrfi761ph"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-03-04"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "2dc102db03e83afc473c80a7d962974841e13b54"; - sha256 = "0nwb71f49838fzgpgq0y5q9n9yhg2k7ga4rd2dib2cd3msccb09g"; + rev = "2828898ad6f6ac6c1c9f404d72bd3d56546b0c72"; + sha256 = "16wxih5nhdybzrm04z18cjwhjvdxq3yjdsq02v7q4kxwkbz5sy1a"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5184,24 +5316,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-03-15"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "812604b7b100e555062fa41c82bfd9c6c776d856"; - sha256 = "0llfdja9ppkmfak9hj7v5j0raijcqwbj9jlqkk312x65040wda87"; + rev = "626be4c4ec040aeaf6466c9aae17ee0ab09f1a5b"; + sha256 = "1glf2xf4frr1in0yyar3aybmhrymrn5lzc261jdflpi749yfhadi"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-03-15"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "2f7192410e5a20981d5b778f3390896f016897f9"; - sha256 = "148h3cbsnh1fs02liiqxzw4iy3wk1lln0k4m3w1vxz5v3h27yscn"; + rev = "02a7799750a56865c58e3ea58e13b19ae1d2dc31"; + sha256 = "1y7v6xa9n620vlzcvvcf7xc1pfbzidz7ybr7yf1k30gyv3sxpp4j"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5244,12 +5376,12 @@ final: prev: lf-vim = buildVimPlugin { pname = "lf.vim"; - version = "2024-01-08"; + version = "2024-03-18"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "b3eab10da0af41caffe6b4757b44d9179f807fac"; - sha256 = "1gzmg9f0zh55w63yyqz3c7qqwmdljv38wa11wzfi9cvjh90qymvd"; + rev = "80a2ef0b1632258c6f5bfce21524c3b3d949a774"; + sha256 = "0z96g59pdz6pv174pfynyr71j082mbg6bkm4kpnsswa3qgg5ykxp"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -5400,12 +5532,12 @@ final: prev: litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; - version = "2023-11-11"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "14b66cc6ff76deb67259db99196c0da5a6c75ca2"; - sha256 = "0ynnn2rknyzyjn796lig32n1jycapg6q4zrpzllxlvqyhyhxsjf5"; + rev = "3908f52f2e69438cdeca32771d449f8ef3ee3bcc"; + sha256 = "1x1100r11k0g0nkc6a2l1hsjciav5df6k9qv8bxj051wkwawzg0g"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -5472,12 +5604,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-01-24"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "5e18095a637ec969b86c72266872219ad2f4586e"; - sha256 = "0lls2pa86lyfzwmipm6rxpbv7qgyx1mlgzg7rjr44y2rkv4m62fl"; + rev = "3612642b0e2eb85015838df5dcfbacb61f15db98"; + sha256 = "1pizkn16ma7yfsy19g06f6l6zkqwsjkmzybqhhhp18xbbyj7m8cc"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5496,12 +5628,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-02-03"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "6b023414d7a6264ce1880148f1a61cf10294546e"; - sha256 = "1svxn4kvhr666hcjfm3qii03wl2djxch52ffn7a2fggv7116vjnn"; + rev = "be3486a501fdda84ea91a0949178b75e8476030d"; + sha256 = "097vn7y6gal2fimpvvqm70jz6im3pnb370dxvc7zmw1yrr3zjhc4"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5532,12 +5664,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-03-09"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "14c9164413df4be17a5a0ca9e01a376691cbcaef"; - sha256 = "0j14qznpwi80hildcd0gwmn2qyq3cq2y320g812c0g4lp6w30m83"; + rev = "b93f040edd57888cd6a1e7d9dee47dddc4463f8f"; + sha256 = "02nhnm7lfdrx6yfwm754khndkq4732qnv99j91d46q68xi305p0n"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5567,12 +5699,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-03-10"; + version = "2024-03-17"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "1b32f64549478efd8f9e0d00517db84cf41aa0ea"; - sha256 = "027fhgpxngagn5khswz4h7kxp9wvyfx2ql9vpxbvvvckwdhy6ql8"; + rev = "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8"; + sha256 = "11njh62m56az4mmvzsqh2pm852bv1c1zp1m92ma4q5xgq2jvpg1v"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5603,24 +5735,24 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-03-12"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "74b13f63417014739ac09576f7196bec301fa2ac"; - sha256 = "0gmq17w6fn4zvkqi7q1ixdsk54w5aswl8w0s5rrs12qk852fymra"; + rev = "a4d442896a9ff1f83ee3db965d81b659ebc977d5"; + sha256 = "0567ckm6aq985md5mccy1zz6q409fk6r682h7vpfslz3iic6q6l6"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2024-02-03"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "42dd3572cb09b52a137e91e515f2dff5eb631b1e"; - sha256 = "1hirgy2w7lqn22qb20xkcxd7p1212wvra1xbyy43ky3an0bn6ivs"; + rev = "4296c2c7aefbca721d02a011366a1de30598046c"; + sha256 = "07ql6j5m3sdkwdn273xmqryksrz4ggw3plgxr4f6n7s07jq05qrs"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -5639,24 +5771,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-03-15"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "af4c3cf17206810880d2a93562e0a4c0d901c684"; - sha256 = "0nxz4gw4lycajmi22mnrhpzrrcrszgmy9xi9a4n9k6ps716icq25"; + rev = "0a5a66803c7407767b799067986b4dc3036e1983"; + sha256 = "1llhfs5wgv87k5hv8mdyv4qjpw37zq27488lq0j063jicxszdhar"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-03-03"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32"; - sha256 = "1v8ya2vgff4c4k8sfyy2wn9spwwirad56p0jb3k3kiz4j2vf4spv"; + rev = "03c8e67eb7293c404845b3982db895d59c0d1538"; + sha256 = "1abfssd3352kp7r54rnbl85cjz1cbxl4w48vr437k1dr6b3zcgcq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5676,12 +5808,12 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-01-23"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "2e8d34e748642621d761a65e3c2a198154b914e8"; - sha256 = "0v98vaz7d2b5fj61afhhcbrhfjri0s9n6kqg7yxa2qqfyqzd0x6v"; + rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; + sha256 = "0cacfxrvm1fx73q5mch72gglrg6hvi39w78wgfb7dfkby1j8hl8r"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5760,36 +5892,36 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-03-16"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "82c7cb08ddb836ad938b2708e50085f12a8825d2"; - sha256 = "18x9a7dr4904aqnnz0wqkx7bx6xnd1wnhbx3adq8sr651vj6pb1y"; + rev = "44509689b9bf3984d729cc264aacb31cb7f41668"; + sha256 = "1z65m3hfx1avi4wfzsf8ypin5d37j3mcipay9rnriwhc8q8vwbb1"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2024-02-13"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "1212fb6082b7177dde17ea65e429e027835aeb40"; - sha256 = "0zrdpdqklmk1f9gsim209x28h4qisf1hljmwq2imc4lzpwca39kc"; + rev = "b129892f783740e6cf741f2ea09fa5dd512aa584"; + sha256 = "08152z7smaxv82v7ivp92n58lvr3ys7976795k0pxi8a99qj9kw7"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-02-25"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "3b5068f0fc565f337d67a2d315d935f574848ee7"; - sha256 = "0jysblrni94541gr649q0rdzlfaa1mc7nvzx7rndcq5fr14mzk42"; + rev = "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10"; + sha256 = "1aaf19a4iqh8ayh4fghgs7inyg01fd7pdk3qr2pgz12mbawm62d9"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5808,12 +5940,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-02-11"; + version = "2024-04-04"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "1804e517ceb0fce958a9fabaa94c9a6e09d54b8f"; - sha256 = "1x4cqwy9anirl8y4lby1rdnxblypi256qdpcdd8wccfk6jsvd74r"; + rev = "772e41a7f33743224f30799a3a887dc7dd853f8d"; + sha256 = "0knb5d6z1hjzn3ib0nznv54rpyyk0ms6g2na59apmcwdqh1wyz6a"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5856,12 +5988,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-02-14"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "ec15b091304580f1d37e711c3a54bc828b09e255"; - sha256 = "1240s01m9mayjgqr0py3zwmbnvq06wzpm3pwdjmy3mj6kkaxxccp"; + rev = "5feb4a08876b81ccb61cae1adaffa2e737124922"; + sha256 = "0y093aznqxkmbwprj0mgabxf2d6zy2nrr3s95mjr59c078b4lch5"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -5904,24 +6036,24 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-03-14"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9968f6e221ae7bdac57a910c5bf2026186aa023c"; - sha256 = "0sg5y4f3idxfcalngipgsajsrr0jjhpy4klarcnmq60sv6dmz5dh"; + rev = "e623d29561746637b49d30d6434338f88f44e856"; + sha256 = "1if6r4w7qpi3d0z1zdwfwz211n5rfiizxvjjsywdb4659ap5b0mw"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2024-03-03"; + version = "2024-03-17"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "6dc0c36fd92eab38064f22c016e43639f42293d3"; - sha256 = "0ch6j2xdgh61pb5qzhsavvypk1b8mck99zn9j2k5fdn7b08i90av"; + rev = "395378137e6180762d5b963ca9ad5ac2db5d3283"; + sha256 = "0pfzmlf36in086g83g3sdqdy57jyyh5nbh2lrfmpbr2sg401a7qr"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5940,12 +6072,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-03-04"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "0a42aa3c7c2c982a1503e63ce8f0f065e0eb63df"; - sha256 = "1p5vwzl48bgfzxk4nwxlyf98ymjyglm44942lpm8al908ysnpwc2"; + rev = "3486f98dfed4cfbfa83922f73c7189cc88e9e2f2"; + sha256 = "055kcpcjbr011rmccns63k21sg8x24yn9f2r45n30pl92irpvmqa"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5976,12 +6108,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-01-02"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "71fd92fb7b606af51b48b0cffceba8193e2e8713"; - sha256 = "145gzlx2n6bgfb68j2dpbwnclr0bdwmdigd3xfmjk0xnnpdardf8"; + rev = "08b7268c59f6d4b4030107d9b9fa934f4063d9e7"; + sha256 = "10f9m8jji4yq7pxbrk46wi2s4awvshm8hi6wq50ckwsabfn1wjb5"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6000,24 +6132,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-03-13"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "8d31d04e18acc419f147452861ad5eb34b998276"; - sha256 = "1nlpg57zfjbla9draxpp3iw8lcsgkyd7y9vgc81q842mb1syby4z"; + rev = "f3a40c744d177862682f0787eef7e5ab0f4e0118"; + sha256 = "1p9x9zqb3lsi6gzp9n0yh62w69im265yg2xp1dfhvzg3nn2s7pkw"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-02-11"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "1b9b086df95ad9a6b946c56f65fa2d048297c00b"; - sha256 = "14iks0rcnr695lv39i85ysfh4752y5x56mcr5dl9np5sk7820v3p"; + rev = "aafde73a622435891d36b411d8623e705ead6293"; + sha256 = "14cdrkglg0swn5nfs23z0j7jpf5gjdm1cgz1arhi1afi8dx8cr6g"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -6048,12 +6180,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-02-21"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "8b3e14682eed06a532b155c7eae33e174846b3fd"; - sha256 = "02ar7m9g92lg7rhz7l1vm2sn8c353wk1rvl32wdbqsbi70ac8pi7"; + rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; + sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6312,12 +6444,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-03-15"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "00b46a1ee17ec2bb93b52e1aac7d1449b659f53f"; - sha256 = "1vmfscin3lgs97pxxfhlw2nvc0nag37pwhba4p1sr3z89jrc4xi5"; + rev = "25bfdbe802eb913276bb83874b043be57bd70347"; + sha256 = "12z784x1ij1j3dnh71dcx2a0vcz5pnlls00j01gadybxbz4r6y39"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6336,24 +6468,24 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-03-16"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "68753daced3b41d6b5e4a441b10a69c1ec33523c"; - sha256 = "0f3lvrvs9sfwvr47bnjhxapgkgz790vwdgn50cd6lgr849n64s8z"; + rev = "19cd99ec623de29a9d0e649b606a13d1775058af"; + sha256 = "16dj2b3vw9zv7p01qiyf6wnnn3lwrh271kx3b4gismg1zbbrhzwi"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-02-28"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "fe83e48ad6f5fa7f70c93b47694c36d0d7deff04"; - sha256 = "19za72v7mq526lpd3a9b6pmxh983ih804q0illmsl07a3wm9gnad"; + rev = "014e78cff9f1fc7b3b46ec67fdca68a91a9b7c65"; + sha256 = "1dyw315fhh6fll1gxq764yqlrd7xb153y4g7dvc7rih9rnqi3h4m"; }; meta.homepage = "https://github.com/IogaMaster/neocord/"; }; @@ -6372,48 +6504,48 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-02-28"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "84e0290f5600e8b89c0dfcafc864f45496a53400"; - sha256 = "0lcfk5zdcdqpd2d6whzbzafp6nh1y422nbaa2ap6kk41nlcm68jp"; + rev = "ce9a2e8eaba5649b553529c5498acb43a6c317cd"; + sha256 = "1gkgiyz1q2jimbfwq1zjzq1zdv2zvvj02ka5raxi7zvvacqlw0lq"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-02-03"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b8e0baf965d2fbb173aabe3d847538744c0e321b"; - sha256 = "1b9xrh8zp2x05pyn0rrfzx1db9hv98737zn910fm36arbhr5flvq"; + rev = "4372abb846f43ec121df40e620682c985ebc8286"; + sha256 = "1wk6vzigd6kbjfqfbayv5jbrr9lvmkxqc9b4fj5r90qqcqmfp399"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPlugin { pname = "neogen"; - version = "2024-03-03"; + version = "2024-03-23"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "b95347a588401a755eadd17482edc1662876bd58"; - sha256 = "16aw070mfm9d33jsc0xbmpwsna61pqci8h896phizvndp1lx9lfw"; + rev = "0daffcec249bf42275e322361fe55b89a05ff278"; + sha256 = "1y5jxdkv5ap5f2rgb47xdz28gk376k5m3aql37wlzz51qpayb3aa"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-03-14"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "bc6aca9242bdcf61ea8aa4355e24f7bffb2aa8f3"; - sha256 = "1zn5akv15069ldjnlbiy1b5hi5d2jfcj45wqh2zj09cq8hd3zqpb"; + rev = "0cae7abc30cb91d661f28257c331fcb5b5198e31"; + sha256 = "0alyscd5qhh30p6bsd3qr2h7qsc57yb4g8c0g7abc5z0jsw58cg9"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6480,36 +6612,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-03-04"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "086891d396ac9fccd91faf1520f563b6eb9eb942"; - sha256 = "1k152lzvizaf1i7gkbjilcvs9l9d13zs606qjw0mpvyhzy4rqd0r"; + rev = "e03e82bdf6a2c3173f6e417a63087c7255533b81"; + sha256 = "1n83wjzxd7y8cmbxgmszxlh3anb32cbrzk9zrlfdpawyn2dyby48"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-02-10"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "418f8fd4bd7360d954613a2322b4eb2888ac3ad9"; - sha256 = "0r09xwvzb2ma25ngfiilwd9i6ci2llkv98scdzjkq5z96m1h6vnx"; + rev = "92c1c6064429c74505de8e5d84a6dc8488a6f8e3"; + sha256 = "0varnp4wm1sp9mr8yglj2kb5wl8cdf4q9ymxf3szvbv2xw1bbnb2"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-03-10"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "21d52973bde32db998fc8b6590f87eb3c3c6d8e4"; - sha256 = "1hxf9218asn22lpa28zb6kmj64a8ak4njxj0whl60a1p0349s4qb"; + rev = "c513218d864d4ccfdaaea991c6de67bdb84bc116"; + sha256 = "0i6xy9xqplv9aii148g1nnwv3shnjqiq9m0gab6gav9l6144mzz9"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6550,26 +6682,26 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; - neotest = buildVimPlugin { + neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-02-27"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2"; - sha256 = "1pq9zjcnihah6nlz2zhkb1shv5x0k3dcdxfmc1v4sq13i6yj16c4"; + rev = "f03a78cef74db5638e4312e18b767294a90de8da"; + sha256 = "1lvwmgicnqm5r7wg0325ijjfkyl5wyawx7hbzmlmr87g3z1cp62j"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-bash = buildVimPlugin { pname = "neotest-bash"; - version = "2023-11-18"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-bash"; - rev = "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb"; - sha256 = "0w1x9ya843pa8514974frdd8qmzycnvj418igni4y3wy3s0dc65v"; + rev = "a3480f53300842922ecb79693e64bf51d4f22337"; + sha256 = "1dbjv5zyw5nqqwgqagq0q2255byzgc9ckrzsbm2dc7svqp04hki9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rcasia/neotest-bash/"; @@ -6601,12 +6733,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-03-13"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "15943dd05e2d4d9393531b647ad661e60820c608"; - sha256 = "0vcx6avfbsjxv3nwbmy6101yb33msx6s3l1mzmnb7rprgcy53zm5"; + rev = "3844d16706d7655f4c84387bdb68eb8fb0155ef2"; + sha256 = "0dh66m1yyzzsrcxrhaydqm7ymqspggnd345c8mfjprp7312x3yc5"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6675,48 +6807,48 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-03-13"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "948fdb3fd73fa7c12692c48b6923344557d81b42"; - sha256 = "0sb7nhw3mf15by21a6387qs482b9aysin220cvw4w2schf6h760v"; + rev = "0367f44e49aa64d8b66fc9f736a61e9a60ce9526"; + sha256 = "1yb9l9gac08sqx6maxhfhb1dj796l48gflx1l59l4fxm9sw7djkj"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-02-11"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "311acc2855cc76917f59f5c534d55e5c91e26810"; - sha256 = "0gqhddq6z6q7jdla19l48iyac29wg8m58z27ybbas8sq96p9lqrf"; + rev = "68dd64e296c6da73aacd7ad795ac789e15087ee6"; + sha256 = "03iap2dsawqj1c8jac6lm1knc16ikiwzgp7hnpv2k43vny52l492"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2024-02-19"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "959d45b133de938c79e3f064db188680eaf69055"; - sha256 = "12mkqbz5qg59nc3lqn5sl7dyi5631xpish8i4c5xaaxn3k5b9pss"; + rev = "514fd4eae7da15fd409133086bb8e029b65ac43f"; + sha256 = "1lmz248bzdhggvarikhpr5210mbw9fycks93k719d05sb4l6i2dg"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2023-11-05"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "0129b64b7b7ce6c8a6dbd53782a5c8a855c10835"; - sha256 = "0xb1q1xkw6g4jpg1q7lw97a2fd4xi9zizvrfcj9xc1m6vx1nh8b5"; + rev = "f56e5a84fc89aafb6e0be368a58ad1a6f8723444"; + sha256 = "18xi436a164ly3d1wb0a8pzsa1fb8rshqm4r9rp0da85ms2nl14c"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -6735,12 +6867,12 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2024-03-11"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "d5e920ab861d175080524b9a3caa5ab8c372def0"; - sha256 = "0wa3f383narj388xs3nrb3l7fjfrrvmcnqwd64mr2n6347gqc3f0"; + rev = "5799a4ea84450af14461d24edbde43913f9b3008"; + sha256 = "00dwkqikfsnbvnmjpv8n7m45g1pcvg20mhj04nfj2lv9pyylmwqh"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6783,24 +6915,24 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-02-29"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "0d73fe6de6baf951f6b95f55a4770429b9d58953"; - sha256 = "0fspih2j2xmjczkg0ka7y87mwrd1x6f6chx5b34b646bqjabwfjc"; + rev = "c1c3f36e1b1a23698534e6326e90876f87b773a4"; + sha256 = "0yfd23mkvpzddgxxsfnzcix0qr4l1cjfk0i8crw8kzb01n6dh5v3"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-02-28"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "9e9df68064bd6fa3b5e40b32fcb7c52af130cdbf"; - sha256 = "0h8fhylg1rhgjxjhg2d3y77fhril6ng3cj49yz2g8hh1p5xassfr"; + rev = "0418811e1e3499b2501593f2e131d02f5e6823d4"; + sha256 = "1ffa0in8zvw6fc9lwga67s9gjqmvn1a69i3wpajrslf2d0ngmw3y"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6831,12 +6963,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-03-12"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "102e7494bbe0f205d28c31a3fd75a9dfbcc78c73"; - sha256 = "03j5vfqryi419d5x0ssxpasx93jkpraj2vhwfclbhwfjf1d20jkl"; + rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; + sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -6855,12 +6987,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-02-05"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0a9804db5c08dba63be9774a57e4214fd0473ce1"; - sha256 = "17324y4ywxmijappa9sb194xc2mwa8ijfxvb3s4302bnd6ggdw7h"; + rev = "e03beacbc51f1a985d7a4b69828fd7612a4151e0"; + sha256 = "1yf3j0lqcsng1ksq5wb1l8pcw6r9f6apzn6y2w5j431sm2by5jw4"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -6975,12 +7107,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-02-19"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "92f03c01405477fc61e410bb75d4387781a493dc"; - sha256 = "02ih6pjapws1j62mxa02dljjzm82bzms4ccjldsz5l02ks0k8vcr"; + rev = "d6b33ae7376dda6f26cca8365d9beaf66f43c410"; + sha256 = "1m6zdzkaynja934bzdqhw78zc58j70c00l6c8yh04iaxn41vi155"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -6999,36 +7131,36 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-03-12"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "7f139517b6d2f05ee6542850b04de004a6b25dce"; - sha256 = "1c20y1f0sakbajsmzk0fhv3wqwsni3wxlvsgcgzxbf922rm9ln3x"; + rev = "94aead739b6223feb19650077c9694e6c1c63fbf"; + sha256 = "0baw75s3r09pf747rm3mni07pszkba5ykk1vky2lqq2ga7xplalf"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-03-11"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "a4eb88b2dad3fba5c2d87f82cd15dfb9de73913d"; - sha256 = "1vcpb1zc9fxlb3vsrg4p9kqclmfmngkz1sikrhv61ikzfsdwcbpn"; + rev = "ce0cdf8538c8c0b9c8fb2884d3d1090c8faf515d"; + sha256 = "09hij99myk1ry8sik71sd2cdicaqrhidpkay6yzs0j67wr0705yv"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; nightly-nvim = buildVimPlugin { pname = "nightly.nvim"; - version = "2023-10-20"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "Alexis12119"; repo = "nightly.nvim"; - rev = "825299e1dfafc093918137e752bde2dbaed60503"; - sha256 = "1g10pmg0jkj5bfsm1kvws9al2s0b2b15582815nf6mwr9fmhhbzy"; + rev = "af5d0e092c8735ec3b7097390d8892f02a321932"; + sha256 = "1d9cp2di71i50c7iir7dcdwyq32dx6pmj7rf5infzc3vzd78091h"; }; meta.homepage = "https://github.com/Alexis12119/nightly.nvim/"; }; @@ -7059,12 +7191,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2023-08-23"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "2a52e793d4f293c0e1d61ee5794e3ff62bfbbb5d"; - sha256 = "0fnc2kbxi8bs939dqbjgggx8nhs9qjbvqvj3rbbxbab902pzhgi6"; + rev = "78064fe0dbb67d2f449854bd2fe7fc2b1af0a8c0"; + sha256 = "0yh9xalsj4y2yh7avabvnw2jj7b1nl1amsxmcxm9jiz0xw50nkbf"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7095,12 +7227,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-03-15"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "ca5c80feaf6b412bf16244bc2d802a7e99cbae7a"; - sha256 = "0s9s21hpsiwxrwglpr9qdl8sbazx4nmkqk55wfwsrkinchx6zcg9"; + rev = "34625be12649666b7ccb08761087cc97bb788552"; + sha256 = "0g3vbsvxaf5ywaifffkhp0q0kmbw83xbmi7h7q1afdf10gi1xj24"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7119,24 +7251,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-01-22"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "bf67d70bd7265d075191e7812d8eb42b9791f737"; - sha256 = "0f1rx88zjk062w8d1wqk8m1yzpyp20x781s29kdsmr813p09vl4l"; + rev = "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12"; + sha256 = "1plky0f7nmh6g62sgil366m54di9jd86xk7y0nq8pc4m8lv0ga6b"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-03-15"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "72e25ed4162474ef5d666525853f8a42bffd97c5"; - sha256 = "13h0ldwvl1iysz1xz22bd9k8rp7ilcsbhibv5xc0ybqqsfv0ndhn"; + rev = "88821b67e6007041f43b802f58e3d9fa9bfce684"; + sha256 = "09mv5ndk0xnij3nv2p1qcm6k59xh0j2nl949960d24aln4h354dl"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7191,12 +7323,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-03-12"; + version = "2024-03-18"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "3dc46d725f7b94bee5117c0a699b57b1902b5d65"; - sha256 = "1wqf7p8hvspnnr6w3vd3kn4z0wmsg3ishmim68na0h0x8hvx5h2h"; + rev = "cbd2668414331c10039278f558630ed19b93e69b"; + sha256 = "1429x2c6j6nap3nzsmsnxflgbs7wbj0g3mi5d2kww8413qvl5gk6"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7227,12 +7359,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-03-16"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "178bf21fdef6679ea70af3f6e45b1c1e6ed8e8a6"; - sha256 = "0rhyh9j28y2f3s4j1lc1fcwwxh67xnc7i2pd3pz3j95zvbws8xg8"; + rev = "f8e6c59985f1d5f820f051395e88064a8d16ef2a"; + sha256 = "1ss67kpn8lkgcdj90yjg69dfdy3w2v32znqc2nbl6hblgmxfakd4"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7251,12 +7383,12 @@ final: prev: nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; - version = "2023-10-21"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "6af458f0196215f397db31a6e1fb2df795811693"; - sha256 = "0pvdbk48pyqvi75pzpsz9wsvhfrp5rya2dbccg2gfx3h5yvks6fn"; + rev = "96bbf843595dbe865838b3f2484b73557f34700c"; + sha256 = "0lqqjzzysl5n152z2j93fk536w2vdi67hss76ai881jr9l4xscvq"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -7275,48 +7407,48 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-02-25"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a"; - sha256 = "1m7ymdyx1ymq1h9xgs6r7waqzkxqzzs2ir4d7yw78cxp0bvlbpn3"; + rev = "4f41e5940bc0443fdbe5f995e2a596847215cd2a"; + sha256 = "0cfi0wmqy8vrrf17s71jyg6c5s8ghb7xjapzhj9l9l6g1s7v9bxm"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-02-12"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "3f8e7a80a0e715952a3066fefe7447f1347207ca"; - sha256 = "sha256-jIoRzMjOZlTHR7q4piyY7MjEUgZIR5pjobfOdY/IpeM="; + rev = "94f684baacf22c65e5ef889cfa943cfc90ee1cf4"; + sha256 = "0b4xpmk6cv6k9h2vqk9773hszwy90d7y3fpjz1yqg9nxfvbdjp2b"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; - version = "2023-03-28"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "code-biscuits"; repo = "nvim-biscuits"; - rev = "0224be36b60588e88b21b8244a0bcd069699720e"; - sha256 = "1pw7ad9x4jn1ciam72bdc2087mrmxwr4przivfpkhjj6vjgfpn1v"; + rev = "ff1d12c8b47cd28723da593b2cfa2e98391d439a"; + sha256 = "18dvvg32nxrdp1ydbvxrzkdg7q214naq2bphs7y1s9zmjhyj25pm"; }; meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2024-03-02"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "b51a37fcd808edafd52511458467c8c9a701ea8d"; - sha256 = "0pvzhj7b0cw3rgy87rq1n194348ws6a0z9pjxrc8rxwsv79mphsq"; + rev = "52703d7adc3be3f7c09eea9a80c5b8caa615fb25"; + sha256 = "030mqvi66rr05icqy2lix1v8sf3745a5v06288h6pq4vz4xj5a13"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -7347,12 +7479,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-02-02"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "04e0ca376d6abdbfc8b52180f8ea236cbfddf782"; - sha256 = "0zzlkla5vgrfa55a3sjb885q0574s67ji5ps2rq53q82hlfwwphl"; + rev = "ce16de5665c766f39c271705b17fff06f7bcb84f"; + sha256 = "10i720fidv41421as9i2xp4d4kr69zfyvkxjhgv6h41fdi75070c"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7371,12 +7503,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-01-27"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "7310f192af74c6912ca7a40ae1b16253aa95e50e"; - sha256 = "130lxdw0717f1hhkrraa2xl4abpd5w4lqqifi3hbk4brxsric6a3"; + rev = "32929480b1753a5c2a99435e891da9be1e61e0b9"; + sha256 = "0p3gliqn62fzfjkx25ny2yf4514x4a4nli2qgh5ccz4di9nfw5vf"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -7443,12 +7575,12 @@ final: prev: nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; - version = "2023-12-03"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "cf4b5c61dfac977026a51a2bcad9173c272986ce"; - sha256 = "08lnmizw9jsncmqs1fl1ilmlh3gq0v0bdal1v30i7qhfigr5wsgc"; + rev = "aa4b4400588e2259e87e372b1e4e90ae13cf5a39"; + sha256 = "0cxdrny3pf0bhkqqjpnxmgcxjl22g3q0ccb043hpn7zc894j0grm"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; @@ -7467,60 +7599,60 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-03-15"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d"; - sha256 = "1aspwwmrv6jfg2cvb9n7rfaa57w72d4yf5gvhfxnva8rfwy907gb"; + rev = "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb"; + sha256 = "0a75lxhzbwm66c1fa5b7zpsz3i7raljsbq4d3n5h8cfdv8hgcjch"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-02-21"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "64f73400761e2d19459e664a52ea478f3a4420e7"; - sha256 = "1r6cqvz6kfmkfq6a5vv9kqqqs8sfwhmr26wilrd18sgya58hbdvn"; + rev = "36abe1d320cb61bfdf094d4e0fe815ef58f2302a"; + sha256 = "1xvf1rag0jnhdr7bd29sdj49f7bbshn5gl10rg8axsb71kqir0a1"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-02-19"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "66560f0ebddf96604f7037e1efad3ba6942761e6"; - sha256 = "0yc96r53iy0iim2nkl3rz5fza148fs6wk9y9k19k90ilzhh2ay3k"; + rev = "3dffa58541d1f52c121fe58ced046268c838d802"; + sha256 = "0kjcv8wvh7hwr9wy2najyrxz88fa4s7djz2lnmz2gfrmqhihibjl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-02-17"; + version = "2024-03-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "9720eb5fa2f41988e8770f973cd11b76dd568a5d"; - sha256 = "0ahc1f2h9qv6bns5mh7m90lfrf3yldy018p27dsc9cgpdpb15i1q"; + rev = "edfa93f60b189e5952c016eee262d0685d838450"; + sha256 = "00q07mb401gn1gw666xsc1sp1gvmxj9ilgblrlgjv51pq6vh4318"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-03-10"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "baa5b0dc6663284cce32e0d00ac1f2511b13496f"; - sha256 = "136qm88phwbyn5zdbr6xnw0hvsa7zcycxyg5anhfdc1vxdsh8lfm"; + rev = "3e8e207513e6ef520894950acd76b79902714103"; + sha256 = "1jsb5l4vda1qgsf8qpnz18gniw1fliia5hgap0l7xl40syvcczzm"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7599,36 +7731,36 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-03-05"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "a9f191d5ba27a5943b8992bf618858fa7374758f"; - sha256 = "036mb597k4w86lypjjk0554z7vambyndasnnkl035m885n2vny1q"; + rev = "432dc7a817a4973041f02b418169667c491f60fd"; + sha256 = "1x2791sbifpwk3rzakggja7gr7s4icainaqyhg2x587vw26739cc"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-03-15"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "e86a34da29d385c3f7c85de176b358191fb36808"; - sha256 = "1dvkyzhns94mkvv3midhnb8jqa5wc139768laszxnan1s71rmxbf"; + rev = "e1f68ff238802fdee67c3f8ac547c1832ae2b8ee"; + sha256 = "1n1iqhn67q3fzff4kvqz2ikp5scjbb2wls267aamdqg8apq5dpq1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-02-16"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "e4c811a401b06f86a7bb042b1d64a5cba21729a9"; - sha256 = "1ifi59hd3wwb0wy2ymfbcyhixwfgmj292c5qip7gav8ffqn9cv9z"; + rev = "3e8fceb2b030100857ee72741a8f48c9a1d8595e"; + sha256 = "0j6i7rv78xxkmqgmi4w7yqhj4rng7p2skbgs8gq8jcb3k6ghcs3q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7730,12 +7862,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-03-15"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "03b1fc593638098a35de26d768d5f43b0fe57041"; - sha256 = "1rf9m7skw7zmkp8wlipgdhc33jni97p2lbax6gsxsziajzxmvrih"; + rev = "f098232d70cebe90e27404928c9bc19ca7a5a7b5"; + sha256 = "1xnirwlnby8fr99qkcicwd1npmkx7i557jzvgxfv4m8f4b2vw923"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7766,12 +7898,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-03-16"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5b364bd4db0fb68a56ffe427a370920854acb834"; - sha256 = "0aljwqk4r6dx3hyshz62zd0n39a3vx94zrg7v923zbkjk77hr3dd"; + rev = "ed8b8a15acc441aec669f97d75f2c1f2ac8c8aa5"; + sha256 = "0rqjcksb0dcvvxnc0r4n499xlkviwp2sbn29r8b1bnf68d7qnapx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7850,12 +7982,12 @@ final: prev: nvim-navbuddy = buildVimPlugin { pname = "nvim-navbuddy"; - version = "2023-09-14"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "f137a3466a6cd1965cdcc5398daff54e66eebbe5"; - sha256 = "03wmxqp776dnckyn0bbrhsf4fnah39b98h0b0g6q8l1rqfmm6bfg"; + rev = "f34237e8a41ebc6e2716af2ebf49854d8c5289c8"; + sha256 = "12cm863ny6i9raqmxr7mql1wglxnm3rvmfa8v4dpjr5c64bg758i"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; @@ -7884,6 +8016,18 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; + nvim-nio = buildNeovimPlugin { + pname = "nvim-nio"; + version = "2024-04-04"; + src = fetchFromGitHub { + owner = "nvim-neotest"; + repo = "nvim-nio"; + rev = "5800f585def265d52f1d8848133217c800bcb25d"; + sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + }; + meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; + }; + nvim-nonicons = buildVimPlugin { pname = "nvim-nonicons"; version = "2023-02-04"; @@ -7994,12 +8138,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-02-19"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "7ef112edde3355cb50c3b7bf1e8909c8d2bc3186"; - sha256 = "146ljp5gh7vypr7hj6xxkzhlsg7dja4f0b1651clsi0sarxd59s9"; + rev = "5a7eb7e6c1b921761615b57a6140d73b1cc2b034"; + sha256 = "00bciq19ry0bm05grlissw1x5nkwi1f6bm0lzw4kmm2zk3zb903n"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8042,36 +8186,36 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-03-13"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "d1db6c1d37252b5a38f199e2f590c5a1617d9254"; - sha256 = "1baavgxg61ww72avgzjjhkwkjaqcs9qw95p9a589ifgb9sclxklb"; + rev = "9653847cf2f225648967f6e9363643e327387579"; + sha256 = "15866wdyck6snm0iz9iqd036wqkbfwnliwd5f220r9g5v3cwg5lg"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-03-15"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "bcc9fa38a62637491b75b02e364191553fd858a2"; - sha256 = "184i4zwp0m4bgv0pzj9acc7c2h0yzjc9jdcjp3k81j1kmfpva1fp"; + rev = "828444de406bc7df3b30c8e000ce6f54f0754499"; + sha256 = "0jar0wqkq4hc9vpw0z1jk69a1jk22bbqn01g1pg7pf7n9m5363zb"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-02-27"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "84a26afce16cffa7e3322cfa80a42cddf60616eb"; - sha256 = "04sapqxwj4siwv5b0zxhv5vxmc653109bkk7yn6g5bckmwkdg2dq"; + rev = "a4e30d33add8a9743b4f518b3a788b3c8e5def71"; + sha256 = "09m95jd84y3b2wrair263f0csqqdx8h45fjq9jrr4f3108494xc1"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8114,36 +8258,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-03-16"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3"; - sha256 = "09dmcbl4mhwr9p5wngn10d4y48qhqhr07xkblc3zwgf0n4cqrkxj"; + rev = "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa"; + sha256 = "0cb4p6bndid12h2bjdj5ybksqjmwv1876jx5a2wlj6h0q50wfjs0"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-03-15"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f87882858438834d2fbb6379aa2be37de901751b"; - sha256 = "1il8iph7qh2z8clwbqwc8l2fn91wpv651sqyhdkyqz9iznb7h2fq"; + rev = "ea4f6d5175812a3f48302d638a766bc18fcbb04a"; + sha256 = "0smghl0nv4w1rpn7gqsq6lbarh5nzbhvi8pfysh5f7am0p42y86m"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-03-05"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "b8b7e52c1517d401d7c519787d5dc4528c41291a"; - sha256 = "1wcwx29n24wy5hlfh6ilsj5x1q3acdv4khh0c4p5a9m5vg4zbyn2"; + rev = "ba4289ad345ececd335a9cdd7b9616fd0bb6be92"; + sha256 = "0cfklfz2anc8021qi0q8dbrdmnndnd073azgsiwaagbh75s3sgh1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8186,24 +8330,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-03-12"; + version = "2024-04-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4"; - sha256 = "159fcx7kfbgrk8lywfrx7vpdd6pdzphrqv4jwlvmjmzmmnbayhm7"; + rev = "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c"; + sha256 = "1jvx9nbz5sh09jnlcqm5qfyjvryibc3fpnfxim7adk5gb4160xws"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2024-01-15"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "55d11124c45e9bb506703f73e5775652ed5357e9"; - sha256 = "0x8bm119dc5jjn7qjya1029cs7g97jfv6sr188nbsl25bfnygi5d"; + rev = "9f9a6b307fb122f13708f78483222abd43b7bb3a"; + sha256 = "1y978c3jgxh3a1wck4xw1c04pyqzl9ayhizp9dz7l9jiallcngs7"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; @@ -8222,24 +8366,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-02-02"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "7ab799a9792f7cf3883cf28c6a00ad431f3d382a"; - sha256 = "1m0c909pkyp5ha9n0p72kvh9mrhl2mzsmhnfanrgyqxj32gaqa26"; + rev = "a6382f744f584bbf71d0a563af789af7190aabda"; + sha256 = "12b12ndva3ck5y18mkmhzkbmaz65kjkqsjxvq5gfniz1br7n2y9j"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-03-16"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "2296dbb8939c4050c222f4eb24889540ef8acd76"; - sha256 = "0dlrn9nlf43byn2dk24pkyjidm9i1zalrkn45pr76ayqy34fxp9n"; + rev = "a5390706f510d39951dd581f6d2a972741b3fa26"; + sha256 = "0fyc504ay04402gk1vly0lz8fa5yyfmix16zsvl29grw6rpjacvp"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8258,12 +8402,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-03-16"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec"; - sha256 = "038inkii20fxk33c8bqz86nb81jf0z02l1gq2ml0k2fd5ffaq0nw"; + rev = "beb6367ab8496c9e43f22e0252735fdadae1872d"; + sha256 = "1qqwfzfk5w2sfaavfa2nn01caj753j272hpnhmvgwknfgvl9cv81"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8306,12 +8450,12 @@ final: prev: nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "2024-01-15"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "8f7b6b46292e0819290b0d368abc3366b8a163fc"; - sha256 = "06njpi7zr0m7kwcrw2pwnhhmaij49p810bsdkav0ynkcszf60402"; + rev = "4b89241c19909f18d2f6b58777c413c027600fcc"; + sha256 = "116j5k4nznsldiv752rhxlsjzr2cha1zclxrffiqlnbldiyr5i8i"; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; @@ -8332,22 +8476,22 @@ final: prev: pname = "nvterm"; version = "2024-03-09"; src = fetchFromGitHub { - owner = "nvchad"; + owner = "zbirenbaum"; repo = "nvterm"; rev = "9d7ba3b6e368243175d38e1ec956e0476fd86ed9"; sha256 = "0pnh3mva0jjm2li5xnkbfa3cvn0di01b24kqn82g43fjvmf3kxzx"; }; - meta.homepage = "https://github.com/nvchad/nvterm/"; + meta.homepage = "https://github.com/zbirenbaum/nvterm/"; }; obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-03-15"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "450c3dabffa395502800d6ac0b1d1dcd5d89f80e"; - sha256 = "003z6v2r8bd20jlpwknp1la4gqxbqcmkiqq1yvp68b4i1klll5a1"; + rev = "ec0f44e1921d2701bd99a542031d280f1e3930b5"; + sha256 = "1b9b72yrp1xfkag41hxjk903payfrcnjdi7lr5880183mm0im04w"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8378,24 +8522,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-03-11"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1e2376ac6966805be9967f4ea0e4cf7c750f8214"; - sha256 = "04v882ym3kgmja01gw1wgpw09dzjcy665jrmrza3ilir4c192ddh"; + rev = "5646539320cd62af6ff28f48ec92aeb724c68e18"; + sha256 = "1qknswy3hs9lkwbs4pqqbsngyvk7ibl6lhdl0df46ymzpmpkkb8h"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-03-13"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "32e18df30f937e02135398c270b72a4d24b40120"; - sha256 = "15w8adbb9pwsnjch41d3dw4q3dpvrw61wvwbxzyfzhk032133dz6"; + rev = "1f05774e1c2dbc1940104b5c950d5c7b65ec6e0b"; + sha256 = "0l6y9xnz8l7flq0jlh9xxnsp9inny9mbbqg2j2sg0rivq630bbnh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8427,12 +8571,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; - version = "2024-03-09"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "f7310a06ad86072158adc37f394650e7fba9631d"; - sha256 = "0li9zsh7g149jb4154x0z5v8frwlziv45iqam4zl9yjnx0m6s085"; + rev = "6e0aa6465f8fa8ac6c833f6ac4713adfee0202a0"; + sha256 = "1i8dx4k4k7d1p713sinxnvm259pir4yz41kfnaaa1bpfwzfm3jsp"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -8487,12 +8631,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-03-13"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "e4fc3641aa3b52e30496bf34b87f70ef5506686e"; - sha256 = "05kzbw4zm4c213clfc6wn0pjqqyx3baivmbzyppmwmx54l6qqdsy"; + rev = "9cb77d936fd42c2c98becceb0f132df170d4eba0"; + sha256 = "1vj7fhm6z4q9ykl20rgjrxc396l47bfskg306h66hj2wb775clm5"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8559,72 +8703,72 @@ final: prev: openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; - version = "2024-03-12"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "salkin-mada"; repo = "openscad.nvim"; - rev = "5c35ce921a63d59f2a0bb20d872c15a0d4c8aa72"; - sha256 = "1l3xhv670apfjns12xzhf7sn3mf3gdd3xiyirydrnp7bxy7dyv1h"; + rev = "bf99a48bff318ceb28646d27f29f925ba0b10af0"; + sha256 = "1b90bfwwnz9iwwr89whpqn939m5bvw8cpiysc8yaq3yy46gzvkw7"; }; meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-03-12"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "261c987345131a736066c25ea409f4d10904b0af"; - sha256 = "1k1q49gymnpb3b1kp5kwn8q0r6pd7smadjv1v9d70q4ij8j3hi9i"; + rev = "389e91f6f935aa845bc0cd13dd80f75431c34751"; + sha256 = "1fzckfi00bb4mi5l9wadhgv98z7fmlgryx24zipcr7k98pdaw36h"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2024-02-05"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "d36a66af270b63459c080d4589126a06cf56578c"; - sha256 = "015is3pyjn0jrmz03vsvyiiy8fgwrpd1syfq3zmspyyki7blclcl"; + rev = "2a82971d3763474df29d5d32d0699b5bb13c551f"; + sha256 = "1jxiyabkg3y8fcnms9rms844038hjmynbg9wykfmn7n38sxig300"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-03-13"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "6dd878c49520f7e53c75fc14d20dcf2c4a5f326d"; - sha256 = "0xjkp8fp8405bpjg0jwkhw6jris1sz39d46d0n4idyzxf5n8pcf4"; + rev = "e67aa5082c65eeffd8a57b672e1353e8cf2ca7a9"; + sha256 = "0223cmm4hg9c9ywifr0c7zk091ny5sndarkq7sa9vk5vmar5sz15"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-01-22"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "a8d40aecb799196303ff3521c0e31c87bba57198"; - sha256 = "1xhqrgjj37d1wq7vrcw9vwmrvzl5a3vyz4k0dglvgjq5z2g5zb0x"; + rev = "bdfd2da90e9a7686d00e55afa9f772c4b6809413"; + sha256 = "0dc3yndh7fy8fvhh0pr97850bq0563jlqrxi9bb9sm6hzdkvnp92"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-03-07"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "b72f6d23ce47ccd427be2341f389c63448278f17"; - sha256 = "0b44hqiwgh1zvgwslwjmmry4qznpwaymydz0pjgks9msw8zbld06"; + rev = "dd701ed0639ef1e10d0ca8dec039719e916c4a7b"; + sha256 = "1xr0xzf5h1r8ax6djvq1vq936yqmvwa4l0hbjqq090mgnj60arh5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8738,6 +8882,18 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; + persisted-nvim = buildVimPlugin { + pname = "persisted.nvim"; + version = "2024-04-04"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "persisted.nvim"; + rev = "ca9900c31ee6e254a0ba7011ba49f48ebf4c8db2"; + sha256 = "0s9g1jmq1qzkxi1gcvmyf0nmwgqrh11r0swy9pl32916k37zvqzl"; + }; + meta.homepage = "https://github.com/olimorris/persisted.nvim/"; + }; + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2024-01-19"; @@ -8836,12 +8992,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-03-06"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "f7adfc4b3f4f91aab6caebf42b3682945fbc35be"; - sha256 = "0brfbf9ygzb050p4kmk5mx17y8p5zvz2wa1zyw430cdrlqb68nzy"; + rev = "8aad4396840be7fc42896e3011751b7609ca4119"; + sha256 = "06ahw1mxjp5g1kbsdza29hyawr4blqzw3vb9d4rg2d5qmnwcbky0"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -9040,6 +9196,18 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; + qmk-nvim = buildVimPlugin { + pname = "qmk.nvim"; + version = "2024-04-17"; + src = fetchFromGitHub { + owner = "codethread"; + repo = "qmk.nvim"; + rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; + sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; + }; + meta.homepage = "https://github.com/codethread/qmk.nvim/"; + }; + quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; version = "2024-03-06"; @@ -9114,11 +9282,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-03-16"; + version = "2024-04-18"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "2200900e3c1aae21dadb65c2ea2e91bcc39ca368"; - sha256 = "1hbak03xdkj0gfg5zjqdmlaih3pjm0339qvd9jjbp29gzjy6q8hl"; + rev = "7ef0766b5cd2f5cdf4fcb08886f0a2ebf65981fa"; + sha256 = "0pw3dk0rnaa2llvgkqar1j5wqrh3lah2ygvxaqiy7760pyanh38c"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9257,24 +9425,24 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-03-15"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "91badd46c60df6bd9800c809056af2d80d33da4c"; - sha256 = "13swdcp23fb4kl6hr40l3zv4m6zw3d0q91g8anphrv751xqjkyx1"; + rev = "20c5b5259afa7f4867474cc463211d64c93ba371"; + sha256 = "0ysmzf2lfry8abaajjanp3b3358nbgd2d2zs9qfjyrbk0fmqw0gc"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; riv-vim = buildVimPlugin { pname = "riv.vim"; - version = "2021-08-09"; + version = "2024-03-19"; src = fetchFromGitHub { owner = "gu-fan"; repo = "riv.vim"; - rev = "201ffc4e8dbfc3deeb26c6e278980f53d81d7f6a"; - sha256 = "1drl291lq44hf7qx1g6l5ivqclfb6ih9lj5qy5cmv9w9b3svwlv4"; + rev = "ff27093faec2c9b3e3269bdc2af16ac85d6a2d6a"; + sha256 = "0dzd4zzf51j2s9mwr0vjpx0psbfi3kawc8x9ldxdimn5pd216b18"; }; meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; @@ -9377,12 +9545,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-03-15"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "69a22c2ec63ab375190006751562b62ebb318250"; - sha256 = "0nr48zm6wrldx43zc4v4j2jm6sp9627a2mjd6jh62bg4g210ipci"; + rev = "dd4d5d8d1313f0bb343af90e2432ad2f2a9fedaf"; + sha256 = "1zph7b9vdd96xai19g6di48r5p5px0pz8kkq5hfkriq2apygpb99"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9425,24 +9593,24 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-01-11"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "8929739543e5a4dc51d1af1d122bdbbb54e634b9"; - sha256 = "1mm3lp5q6fvrlmq84637y7gjf04917xz8v1y0jkp2g4hi6v119nc"; + rev = "94e49fa6c596813247549cd594f5ab6246c79973"; + sha256 = "1axbrakr3xpmvbdslh803xam72fg6ar428bgz04h0j2ygg75bqmy"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2023-10-29"; + version = "2024-03-31"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "cd27af77ad61a7199af5c28d27013fb956eb0e3e"; - sha256 = "1qb64f59qw4rrrxgqavqs7v05v47nr3kr36a3gcvkb2a3ivasp6g"; + rev = "86a0f5b594b08b2ad65f470ffdee81654942b6ac"; + sha256 = "1fx4n8hvjm1yhbrf0dnh8pln4xr8sqkw0x1c9ij4rfd7iq67a5zh"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -9618,12 +9786,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-03-15"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "83bdcc3db3b272a6e73b0f3aea0f5bc0a8da2696"; - sha256 = "1jj19kffws1fi309qzazq35szq43kdga732wvgy2sb4wc28s7vfs"; + rev = "95d11bfc83263236431ead7dc017f5ab0ff992ca"; + sha256 = "0x9s5801si869gh7jazlfd9asiwk5fkr1gv67qf7bs55pc0z9rbf"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9702,12 +9870,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-02-13"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a62656a798043f3c6b603efa98d4de2da89c72b2"; - sha256 = "09l69n5j80pdb5awja3mzlsw5i7f1w1jp1xwfq72wrcap96xyk3g"; + rev = "da162343354fbd9bf9cd49293a856f0e3761e8ac"; + sha256 = "0mvb9rxsqapp8kz8vh4lvn9vym8lhmqydkh145yxyqvpjkycwbb7"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -9834,12 +10002,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-02-23"; + version = "2024-03-17"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "1aa617d15a9904107a68f95ebf5036b7d4abf64d"; - sha256 = "1yjygjjiiv5572ccqn00wk7dc7q30r6jnvxv85qrz5bnvvfymvvs"; + rev = "9b0c30f61f13ba4800a11107648bdd748ad511ba"; + sha256 = "15a3ib947yihdbc9i2i1a8ml4vhfff26lj5y0z7192g8qhw58qlh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9847,24 +10015,24 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2024-02-19"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "40701b6151f8883980c1548647116de39b763540"; - sha256 = "106j1zzsr97jr0pk6ri2jxdpvqc2ci7g8rlsbb5s30lsqr4ix0ah"; + rev = "d0ffd703b56d090d213b497ed4eb840495f14a11"; + sha256 = "1nj0yqrr8dzjva14irp10g0c6xbnv3wm1igkl2cc7c8f3bddrfwx"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-02-17"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "289c6a1499b074c15e30cf437364837dd4966f83"; - sha256 = "1k14nwndx7z3hy7d81zghrrl641bfgpq61n5j0nsrd0kk2xiym61"; + rev = "7439a86e19714adaf1d4ae2c69ada19d5c779526"; + sha256 = "1s237nky24ijr732dylyag86fkng5a93jv36makbq4sqr2b1icl9"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9967,12 +10135,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-02-23"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "d954893262a57a92e46edd87de67e2b3fe72305e"; - sha256 = "1i8nvhbrcsinydd1ppnrw6lr3izh1dwp860hr7axyfjgqxgx39f8"; + rev = "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc"; + sha256 = "0dvpfbyvsalim5ml37vprh5ay9brdjfpcn08rgg77xp6pcjrk2qb"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10027,12 +10195,12 @@ final: prev: suda-vim = buildVimPlugin { pname = "suda.vim"; - version = "2024-03-12"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "66727b416837836712975e748bc8a19fb6cf4ec3"; - sha256 = "09lbnx6mrqsrn6fvcp3mb6mkwbrkdrvr5rgzp43idj0ipm5j809h"; + rev = "04469d855e36fffcda6be036eb7ff005f64fa0d6"; + sha256 = "18igbn0ldh3mwf8qlnfbbidk88l1wfjx1v95dmdwd1xif642bppn"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -10136,12 +10304,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-02-13"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "c4df244245e116280c961112cf6ee221ca3bc294"; - sha256 = "0mnwdhnqrcl746hzm6v9g6n2f3hy8dkk9gn19nmi32xsybw4hpxx"; + rev = "67d374290efc6108a7a5017c3405c0dbb4c8b92d"; + sha256 = "0pwml4adsknfrnl7wrd2dkb1pzgcvwggi03c02p3pyrk5hnhgx70"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10197,12 +10365,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-02-18"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "6a8f4e67a9bfc9bfc9989cc45253180598cc4339"; - sha256 = "0j4n6f8k2054v77pm458q0qf36ipyk31lplm2m4fszxq0sq0kmwp"; + rev = "c442ae7788c30dbd41d259c51df4046cb8269a96"; + sha256 = "0rd451fz9i6wbyzjrdkjz4phwlq8fz1lcgmbdjrjxvax3hkpbbqx"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10305,24 +10473,24 @@ final: prev: tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; - version = "2023-10-03"; + version = "2024-03-25"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "90eaf759099bcd47aa0471f974109d7fd78e4eea"; - sha256 = "169m394b5rc6x9sx92ir4p6h4ipclgvmlqmbxhf0phpmzldvgpaj"; + rev = "48ab639a461d9b8344f7fee06cb69b4374863b13"; + sha256 = "07imw4v3xcbs2r348drr2v0ka81lhh8gbf76hhdcpnfhx3lpbh0g"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-02-27"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "a684d6ebe7026944b0a5323219d5f5364511e5b2"; - sha256 = "03hsj2rfhllpxy0x8nr5sjp2krfg51ib0771bqmwycnlfg3cp1bw"; + rev = "24fd8c1e7eb989dba9efa5d174e42870f08da8fb"; + sha256 = "1ky0035jar8i06k8w4mkizbcyiib393zk3cwr14fnsvq94jp23bs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -10354,12 +10522,12 @@ final: prev: telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; - version = "2024-03-02"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "421f50c56d66bc8f39c5deec05532deb071b597d"; - sha256 = "1cf6990fkrzbagwphzkyh10i30hrv8vbqgmf4znva3ms1ad7ilhf"; + rev = "55ca0d6960eb1c32f9f7967fa71926f7bad484a8"; + sha256 = "0yzw9k406q1ixascqw8maw9raqny6cc0cp1idmdsrp8dnvl954v8"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -10378,24 +10546,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-03-06"; + version = "2024-03-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "8839e3f8070dfafa5b0c0e4652700298e7b872c4"; - sha256 = "0arrbh4n7y1x8gjj6qkfssrfh3ni6ls9lsvdzjwm4b7hq6b79pxj"; + rev = "5ee5002373655fd684a4ad0d47a3de876ceacf9a"; + sha256 = "1ar218ymgx6432183xvd0rinnv0gwiqic9czv4z9hiwxgw9cwcfd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-03-14"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "bd52772bf2e8d3e83f1575a018cf4a0e8c3c09a3"; - sha256 = "0i6qpsjj78yyqkvnxmk8rpf654ll649rvi6ck0qcf0v91m27i509"; + rev = "94a532cb9c4713db83acf5432f5aadfd096e2af9"; + sha256 = "17243ls89kdalb0vlx84blwxan9g8xdin9fvzyk5xkb8b1wbpz5p"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10475,12 +10643,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-03-11"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "bebbcf6d6980c6b8f843508d42f641413af0505c"; - sha256 = "08chi9p3gpgxvyb985fzzlfxpy13al01zv96mqz4kzl3k78nnz3j"; + rev = "bd6b110a08cc5b7c098020325ff55218a5b249da"; + sha256 = "1dj6bdx98596l2lnjcdd2c5zm5j00cid0kdb0zd6vhv1jfw8zqsx"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10559,24 +10727,24 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2023-11-16"; + version = "2024-03-26"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "d3afc1c105535a90caec092ce27a113f77ba7b84"; - sha256 = "0cpkjl6pffwdrh1hawpd042gpnyqbg2r8f1nz0fwdk175bgsx2s8"; + rev = "d19e2edc8b18d03283bd91f67310ac300ad003ce"; + sha256 = "0pp98xgdgcpykbsm56bj6w9j178xricds7hsqzwgcckf4zwknn01"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; telescope-vim-bookmarks-nvim = buildVimPlugin { pname = "telescope-vim-bookmarks.nvim"; - version = "2022-07-17"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "tom-anders"; repo = "telescope-vim-bookmarks.nvim"; - rev = "92498cbf7c127dea37c3d27117b60dd7ab9baef4"; - sha256 = "1nflwz7jji4lr621cifg4mq7a6ld4dvaq3dxg7rr4bahh02w5hb5"; + rev = "09a61043496bd9c4240955f7532ff2ae8fe3a905"; + sha256 = "0mkn7kbg1319mvfmx4agx2l1vng1lbqayf6b6xs2rvb98fybai74"; }; meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; }; @@ -10620,12 +10788,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-03-15"; + version = "2024-04-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e9e01d699843af530ef4ad2c8679a7e273bb3dd1"; - sha256 = "0p4yfxdgf6wjzhg72ial4rzls7imsbf6skf82q1nqg7ihkng9rby"; + rev = "7d1698f3d88b448e0639974248cc17f49b7b8acf"; + sha256 = "1k3fhgpakr1b8x9fk7sq699h3479k8x9yc3jbq7xq2jk7p0n4m62"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10656,12 +10824,12 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2024-03-01"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "ff01136712d2000760c7077f2aa06dac7987b696"; - sha256 = "091xrfpa225ia8fk6rr30hzih1wcanmpf5chp3bx8fj0nwmd06wv"; + rev = "1cc8cef28ef10575bf72806959e72d35fec5dc5a"; + sha256 = "0i1ffzz88w2n3ja2kip5fhy7s8klb0r7av62fn5pmhiy0pkn09vp"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -10726,6 +10894,18 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; }; + texpresso-vim = buildVimPlugin { + pname = "texpresso.vim"; + version = "2024-04-18"; + src = fetchFromGitHub { + owner = "let-def"; + repo = "texpresso.vim"; + rev = "30f9b8277b18326e0aa6882fb96d51bc1b40a222"; + sha256 = "1iagc7kld327mkkravk30dz2a0dq4i8718w0k1jrlj0z54981gbn"; + }; + meta.homepage = "https://github.com/let-def/texpresso.vim/"; + }; + text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; version = "2024-02-23"; @@ -10836,24 +11016,24 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-01-21"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "833d8dd8b07eeda37a09e99460f72a02616935cb"; - sha256 = "088b3aabv5k6bvmhwsg9v7njgz95dvvklpjab832dvpifmws4b0f"; + rev = "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d"; + sha256 = "1z6d0cc0vjl504var8p4l6wshbs5i447wg7y7rmk6i4kb39m94q4"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; todo-txt-vim = buildVimPlugin { pname = "todo.txt-vim"; - version = "2021-03-20"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "freitass"; repo = "todo.txt-vim"; - rev = "ed9d639de2e34eafb82f2682010ab361966ee40f"; - sha256 = "1vw4vhbgxnlkl5m5y55xk81vrknw35s01dw21s815i8clp38zr7i"; + rev = "3bb5f9cf0d6c7ee91b476a97054c336104d2b6f5"; + sha256 = "12g8j8bn2cdyas1srszlc7mflf44x2qxxwixbdq5w317m309rp5k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/freitass/todo.txt-vim/"; @@ -10861,24 +11041,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-02-12"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "193786e0371e3286d3bc9aa0079da1cd41beaa62"; - sha256 = "0cz6i3xa61mh8s5b9b2z008ay85ggaw02ak9w58wzgmn172q770l"; + rev = "dca1c80fb8ec41c97e7c3ef308719d8143fbbb05"; + sha256 = "11rmk7hpmf75n0lgchj7hvsw9915m493hlgqsmjkkyhs9w0bwb4n"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-03-10"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "c025baf23b62f044eff1f4ef561c45de636f0e32"; - sha256 = "1sd5ib228yw8vxb4xfg0pgbd06r90kz6pq8bn4f5qhrwi91jnvn0"; + rev = "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5"; + sha256 = "10fngz9assyp6rby36v0qdg5brsrxs921pp984ifyk8c8d4sdl12"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10957,12 +11137,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2023-10-18"; + version = "2024-03-29"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "f1168feada93c0154ede4d1fe9183bf69bac54ea"; - sha256 = "0n5xi4bxfaizwjny5dv0k7zqc3gl60d5g1mkcdbfnq4y5f3f0wpj"; + rev = "b9cf677f20bb2faa2dacfa870b084e568dca9572"; + sha256 = "1507s1s19n3p6p8r77sqswjqgrm5p8q37d1syq2j7cl0zbckp14h"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -10979,6 +11159,18 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; + trust-vim = buildVimPlugin { + pname = "trust.vim"; + version = "2022-04-14"; + src = fetchFromGitHub { + owner = "tesaguri"; + repo = "trust.vim"; + rev = "3e17b29ff13f862eeda269d7ce0260571dab6cb7"; + sha256 = "1zvxjgyzzhnza2gv528dvyp7m1nvsz5gjn0qp65jn0k7y4gh3nnl"; + }; + meta.homepage = "https://github.com/tesaguri/trust.vim/"; + }; + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; @@ -11053,12 +11245,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-03-12"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "8dbc6160138b8d12adbdce5d54595de9fbee9e8c"; - sha256 = "18ajsy8cfqs4si0xz6l72w4a3015icxc59mibcvxa5m42hjvxf6s"; + rev = "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6"; + sha256 = "1l4mq2m8s7kav6hpq6nay4xyy2jvq6jbblyy100yfb9nrzkpggpc"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -11089,12 +11281,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-03-08"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "aa93a7e5890dbbebbc064cd22260721a6db1a196"; - sha256 = "110w9nr24rph717w1vs3vhfq1ggsjgq91zvyp431qxpa7wzd5pyk"; + rev = "56c684a805fe948936cda0d1b19505b84ad7e065"; + sha256 = "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -11113,12 +11305,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-03-16"; + version = "2024-04-17"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "dca4fa3a6c4713cb53621ba0bc04fba86060f8c3"; - sha256 = "0ppr7hiakykdwf9ss2xnlx6cf4z3x4jvl28xz85n4qgi6yq5y025"; + rev = "ac4d817f5e18a0b462b23dcd124f849633d650fe"; + sha256 = "00dsvdqp02bf8zvnk8ljn0f38wb38h8iabsrarycl2a3v6jr8lgr"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11185,12 +11377,12 @@ final: prev: venn-nvim = buildVimPlugin { pname = "venn.nvim"; - version = "2023-11-05"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "jbyuki"; repo = "venn.nvim"; - rev = "e4d68341a73dd56c64955058821a58295fb337b1"; - sha256 = "181sr7p8qn67br64ahg5vhb9b7m9mldwlg27nsgs0hc33vagvr1h"; + rev = "a5430d75875acbe93e9685cdeb78c6eb2a329ed5"; + sha256 = "1dwl75chqbp888yp2ykyqszz0glli2vx2cbw3lsgnrzlhql53alm"; }; meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; @@ -11209,24 +11401,24 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-03-11"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "7a3dcb5796d7f8967fb3f53d0eb18526a41766eb"; - sha256 = "1w1z25lf50m6yjjr7ss96scgii3k020bzvfcbypjrx72gnqrv18g"; + rev = "9cd59bb0cabd34fc093f561f97041be71fdade33"; + sha256 = "1aa2rr4z2f5nps2g3nzjs1kshszk8vbx4pwsr4x1a1llyi9i8gqr"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-03-05"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "26ab577a888c6346a009702caa4522e73b42242f"; - sha256 = "0ji9dabhylj83wanbsg3glag00ajfzdchd5jd9j2pv7aldndvbpa"; + rev = "cb520cd3f9248b9ede236ff3da8ca3e0b68b6459"; + sha256 = "1csbmjrdrlqsagz5b6hryrcglfdplwc7d26q4r20w37zx3f9qzw3"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -11365,12 +11557,12 @@ final: prev: vim-addon-errorformats = buildVimPlugin { pname = "vim-addon-errorformats"; - version = "2022-08-28"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-errorformats"; - rev = "15921fdc10aa56b969ea1e78c5a3dd8cdddc68ec"; - sha256 = "0q3nch4caniq9i347ap2v3annq01vyb0fzm80l493nhiflnjvd08"; + rev = "837928f0c54f3ab73ea1df74a1b2b170ad689d37"; + sha256 = "0mz2vkx9kvawapp27kjh3gg7jc48n3ivc7lzak7bznq8ac3zj1pk"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; @@ -12049,12 +12241,12 @@ final: prev: vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; - version = "2023-11-11"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "8def3d890b2087ee4c42af03117d7edc7d693706"; - sha256 = "129mrz3jxw4kgbg5lz9gc7rznsjp2fbjvi60zyrpkmv8xa6yhmpw"; + rev = "05d7843412c4fb7d1bdafefd04462ac4db841f0f"; + sha256 = "1ycb94cdady4x1bv957zcndrsk16ia54q5kg1k8r8x0ir0gclmac"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -12133,12 +12325,12 @@ final: prev: vim-commentary = buildVimPlugin { pname = "vim-commentary"; - version = "2024-01-12"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "f67e3e67ea516755005e6cccb178bc8439c6d402"; - sha256 = "0r5jlxkxfy5gvpkmzsfkxzlgydn477qiywqlng4xbaw3pijcf04i"; + rev = "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07"; + sha256 = "1v16mnjm8gr540w6smvwbpn1zmjimzwi74a8d165a1yacnmdm6pf"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -12289,12 +12481,12 @@ final: prev: vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-01-25"; + version = "2024-03-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "165699c573469e6a95b48d35052f848c340c5911"; - sha256 = "093iyr739xsi8s94kcws6z0zi8whwgircidg2f34qwc0ix9zgppg"; + rev = "066922699bdf1c6e14d517b844454b12b93ce25a"; + sha256 = "0zqzn7lqgaf9iw49iik0g115nx7ny9z43db9cmxkk8lp5p660v6b"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12373,12 +12565,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-02-20"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "b660af1fa07fe1d44d4eb3ea5242334f6c2766ca"; - sha256 = "1h0ypp7fp47dk8sj1xgrm9113cgsvdczmfilbrix5rmm9b0jph2i"; + rev = "3851bedb7f191b9a4a5531000b6fc0a8795cc9bb"; + sha256 = "1b5fg5d1rvnh9ipl4q1sh4xwgkn55hip303mm13h3ckmcy1cyilk"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -12445,12 +12637,12 @@ final: prev: vim-easy-align = buildVimPlugin { pname = "vim-easy-align"; - version = "2019-04-29"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-easy-align"; - rev = "12dd6316974f71ce333e360c0260b4e1f81169c3"; - sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606"; + rev = "9815a55dbcd817784458df7a18acacc6f82b1241"; + sha256 = "028gcsvmihw3nmc4pp9zyh8na29i6h0fhihk060ka2y3rn5xc9zl"; }; meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; @@ -12757,12 +12949,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2024-02-29"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "c0535d758004bcce016839e318cbbe802b92c469"; - sha256 = "16ds8cc1qj8q0nkzdy35difq49jhbwhji3hlgksyg4phm8m54zja"; + rev = "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160"; + sha256 = "0nkbp4hcpfqj2s85g03rkb3786pa4cdf80mvmbzc89kiqw2ir260"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12829,12 +13021,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-03-04"; + version = "2024-04-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "41beedabc7e948c787ea5696e04c3544c3674e23"; - sha256 = "17vwycm78bxk7y2s931lz3plzsfx39mkbgc4dnhbp9np16ywb0hc"; + rev = "dac8e5c2d85926df92672bf2afb4fc48656d96c7"; + sha256 = "1m33vpkfw1dx3kxxgw8r278a5rch4sd3ngc9mbnap97f0q8karm6"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12985,16 +13177,28 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-02-25"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "744aa9911aa6a86cff494a57efc22ca0e3d7e16b"; - sha256 = "0hmn0n78r1x9hgv7k329aizfysdjadvkarmn727n5p6cr0kwf4wg"; + rev = "feef9b31507f8e942bcd21f9e1f22d587c83c72d"; + sha256 = "10baiz4hklzwr53vrvivmx86c84d66k0yzbajd3p8mi19h3a96gy"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; + vim-godot = buildVimPlugin { + pname = "vim-godot"; + version = "2024-02-17"; + src = fetchFromGitHub { + owner = "habamax"; + repo = "vim-godot"; + rev = "f9c0b36b299efcc4aa4cb119a2be36a83fe10388"; + sha256 = "sha256-HKp3CQwAOs+7TL8MjWZ2EHLHMZ3Ss7AckAZ5eOjTDEg="; + }; + meta.homepage = "https://github.com/habamax/vim-godot/"; + }; + vim-grammarous = buildVimPlugin { pname = "vim-grammarous"; version = "2020-11-30"; @@ -13310,12 +13514,12 @@ final: prev: vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2024-02-04"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "305bf07b919ac526deb5193280379e2f8b599926"; - sha256 = "1pmzh7pz23dl6jmcify9494jwgyi2jfjkg0l95cxfrbjqghjxli8"; + rev = "e522e0dd742a83506db0a72e1ced68c9c130f185"; + sha256 = "0l9306c3867r6dqn4272kkzql63pwfaibhdwisjlc7pcv9wzah53"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -13575,12 +13779,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-03-04"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "ace92c34d72a413d51459ce5e9503e50f3262988"; - sha256 = "18vl1ci6plwfhvq542ad7y2vygfidq7f1cn00s6pf0npiyhghsi4"; + rev = "a2777b4b113dafc639f541ad4f0f7da0adc640f4"; + sha256 = "07dwja75dlwjmn687jbk56yz3srijjagppqn7xyl4bzd0svi4s97"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13635,12 +13839,12 @@ final: prev: vim-lawrencium = buildVimPlugin { pname = "vim-lawrencium"; - version = "2022-01-19"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "cfda83655a3885f410fcf96ea1104ea0431570c3"; - sha256 = "0jxk4xc10n6llr4hx67laxkx9rygrk0w6zyfvb2cpzcjranfmxnp"; + rev = "a790513b278eba1279e1f053aab760cbddbc3872"; + sha256 = "0awx42g0wak2akxmdm5whp2hcgjyqf28v3vzmb06l1fm7qs76c0v"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -13755,12 +13959,12 @@ final: prev: vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; - version = "2023-06-08"; + version = "2024-03-18"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "ebb73832e6795967e5a52db3636a37282871b218"; - sha256 = "1gqyjpxz5np1c5xsgli5c6mk8d49ly6q23b8fp9f800vgg4cianz"; + rev = "841a0645272a485564b8739df91c81bcc03da899"; + sha256 = "0v5yqw5qv3xjl6rhzj18mmdgj8wh12gqvql4yyz1fddf39nkdg69"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -13839,12 +14043,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-03-14"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "b93c195d521ea4d6559880eb8d18f5a503e946d9"; - sha256 = "047654s76zgv64hp2rvx94w5prb6i5wz7l6zbifa2m4ac9sjyqr2"; + rev = "4b3732c31b408953a1bb0fca6f003400abb5bfaa"; + sha256 = "1p02j2k68csvcp5wshhzk29byavsc76gpj7a935smirj9d8nhcmr"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13911,12 +14115,12 @@ final: prev: vim-markbar = buildVimPlugin { pname = "vim-markbar"; - version = "2023-08-24"; + version = "2024-04-01"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "7df6d0e918b610b798368a5af33825b787e0d20f"; - sha256 = "0814n9jqcv62hky04fywgby86ibfp434w4ij03vk5y2z9hgii8bd"; + rev = "94ac768d97b447c6c2a57fac3e555d4348a2919d"; + sha256 = "1287mslww730536xa5fl9czi70hs42zdfaq84jd0azjf7vw6q04i"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -13948,16 +14152,28 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-03-10"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "5acf680e820940b1bd78a501298ff953455b8d65"; - sha256 = "1r3nlqd7b6g5hrcqwrqm0rg095d9a6dnwazxw66wkda2psyj9xdd"; + rev = "05d6538ccef1d33f2d26f2515c0eacaa93d2e061"; + sha256 = "0x9vq6qi7m532la56i9pnp9l4q1s7iy1g7w36451w4c03lsw39is"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; + vim-matchtag = buildVimPlugin { + pname = "vim-matchtag"; + version = "2022-06-24"; + src = fetchFromGitHub { + owner = "leafOfTree"; + repo = "vim-matchtag"; + rev = "54357c00979e07d86aa12b383ddd1d6a7fbda2c2"; + sha256 = "01ar9qma2glb6wyhpafnwpf1f63v9i417hx1dzck1gi4fcz1pfqa"; + }; + meta.homepage = "https://github.com/leafOfTree/vim-matchtag/"; + }; + vim-matchup = buildVimPlugin { pname = "vim-matchup"; version = "2024-02-24"; @@ -14284,12 +14500,12 @@ final: prev: vim-ocaml = buildVimPlugin { pname = "vim-ocaml"; - version = "2024-01-02"; + version = "2024-03-22"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "c11dfa3c1654584ded1e2c5ff502dc53b972efd4"; - sha256 = "15cn1111gfihmpq8kism36n2dlc785mwywc0nnvkyg311pxg8xa6"; + rev = "81be9d05d4ce84be7e118754d0b777006f9c85fb"; + sha256 = "1r2k7zdicsf1c0j5bx5v7m0vr3s5iyyaawmq5r3rym7qnzhsl6lm"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -14488,12 +14704,12 @@ final: prev: vim-paper = buildVimPlugin { pname = "vim-paper"; - version = "2023-08-02"; + version = "2024-04-16"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "vim-paper"; - rev = "c4995be5a73a5b24d69a9ebd932a4e9be58fdb90"; - sha256 = "11psmnapyz8qg2h6rm2wkaq8xkw8kv12nwq5m16baqvf04fp847c"; + rev = "790c31c56ce510cc0c0f777090be4140fe130d1d"; + sha256 = "1w958a6ga1a6518f5cr1nag6vkkxh92hqcv5k6f7410xm7fqdya6"; }; meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; @@ -14584,12 +14800,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-03-15"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "2cd7bf673b5796ad7ee341a4b595a5479c4e9201"; - sha256 = "0m0y9gi200aqvpb17cy5sjlkqm6vnd942xhq817wjpf5kgbdj4fk"; + rev = "d977fa37866a48f1001b5adaadbbdbf88baf35e8"; + sha256 = "02dn70qd8w0vw7qn404lvdp4gp8a4rwv5ylffgpf84dr3lnc1bm0"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -14860,12 +15076,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-02-11"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "3a155462d1c346e291595400ca238037d02a357f"; - sha256 = "0zz510l1ncv3abax76s99cfpc6r6vvb81hnhxzyx4nzgwqzm0qag"; + rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; + sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -14956,12 +15172,12 @@ final: prev: vim-sandwich = buildVimPlugin { pname = "vim-sandwich"; - version = "2024-02-04"; + version = "2024-03-20"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "2ce54d26564e66a675685c8a3331388b2747a26b"; - sha256 = "172dmnb9scblsin4adx0jdw2nc9ygw4icid6i4d6q2hjak9gvd79"; + rev = "74cf93d58ccc567d8e2310a69860f1b93af19403"; + sha256 = "19n17dgkvj3q75l0h7fd87lkj10rz39qcyisqafp3n4i0y4dpmjp"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -15100,12 +15316,12 @@ final: prev: vim-signify = buildVimPlugin { pname = "vim-signify"; - version = "2023-05-10"; + version = "2024-04-05"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "7d538b77a5a8806e344b057f8846f6d0c035efa9"; - sha256 = "00ybb3l0g9bprdlj33f0n3nlf96gm40gsmnlazh9mzb3nzr2knzr"; + rev = "8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3"; + sha256 = "0wpa5d401slgg41mknm6kiaki7frg7wkzs7ymjyn4l5jxq03x42h"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -15148,12 +15364,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-01-26"; + version = "2024-03-21"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "1feef68f237cb840a7220f83c24b6c60bf914eb5"; - sha256 = "1swq6am7jlk52sizgcxcq9lbpqvvwbjnl7rib8s9rwmqy7iaqp64"; + rev = "87988b173b7642e6a5124f9e5559148c4159d076"; + sha256 = "0922p2nbaj8vf2wl697v8yjmfccyvn793mn7n0axlw3xr162qdkv"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -15340,12 +15556,12 @@ final: prev: vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; - version = "2024-02-17"; + version = "2024-03-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "308b0088a864c4711a96e45b6734cf9294074f65"; - sha256 = "0x9vgca4zb3nwnir69df21x1qxar2yf0bshq68rxfswlc00djwy4"; + rev = "ac2cccb5be617672add1f4f3c0a55ce99ba34e01"; + sha256 = "0gblxnqdifln3sswg96dp18h4367hpqb0z72ydrvlz186471zgps"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -15545,12 +15761,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-03-14"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "a49c9cade75e97cace5e3ba545ce82d02f689feb"; - sha256 = "0mw7jzi5qf4wn4zbm63ddn2xa97fhd38rp68ddnbvj8lqqjjkxam"; + rev = "eb5bd18d58a859e7d55d732d37e4e2b94fa50275"; + sha256 = "0v4yi5h8w06vkcl13zhl8hmb79d1g1rc4wrbwj86rxcq7yj490vk"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15641,12 +15857,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2024-03-02"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "5c8df1b5fa495ece990df5596d8e7fa1be2c2355"; - sha256 = "14v75zl5dgxi9pyv8vm79gd578mnq0mw4c947v8f2zhlc4xbda04"; + rev = "c1f4d465ce7dd23735513551b5c4c918d9c1bab1"; + sha256 = "1vzwjpn3jr3ayal2pjr2qb36mal2pa8szbf83nqzb2awa1lv1ds1"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -15689,12 +15905,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-12-23"; + version = "2024-04-13"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "38b1d0402c4600543281dc85b3f51884205674b6"; - sha256 = "0wj7627bvzw2rjb97b3ddkqx966f4xjlw80lmna6kxi0vvx5hsp1"; + rev = "a26954a585b02a2ac02f87145e204f8798a7cbc2"; + sha256 = "01nqxcsn2w24w33d0c4k2w5xyxb0xxvwn7a3pxlzv4i1k36nyaz9"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -15725,12 +15941,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-02-18"; + version = "2024-04-12"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "649f079a0bee19565978b82b672d831c6641d952"; - sha256 = "16lyavpy8qh06l03jqs7klyja3nqs3ynjfy7y8xjmlqa4mgfcffn"; + rev = "5dd3832bd6e239feccb11cadca583cdcf9d5bda1"; + sha256 = "14f4fjjjjml3rbh99385xzkkcfqa7awa9bjc191qvvvycqipp0hw"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15869,12 +16085,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-02-22"; + version = "2024-04-03"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "fe1ec7e430013b83c8c2dee85ae496251b71e253"; - sha256 = "0mvirqq1gmp2270bm92fk3c4d96r2jlkl2s36pm1d00b7vd3vpll"; + rev = "e2ff111f123da6cf97f95b96b10eb95854f953c9"; + sha256 = "0kg3wwgxv1gclyvdws52chyz1jfgmi4hc2pdg9fmkqpkk0g17r68"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15941,12 +16157,12 @@ final: prev: vim-vue = buildVimPlugin { pname = "vim-vue"; - version = "2019-08-03"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "c424294e769b26659176065f9713c395731f7b3a"; - sha256 = "1ig8qacavr15i6z7whlkf2ivw5smnqsw3jwhh4dg5q6037k1hjh1"; + rev = "6ae8fa751fbe4c6605961d2309f8326873fa40a6"; + sha256 = "1wsvxj8fjf8rrnkhg89fdd68f91h9lllwing0h9mzdvhm1q4b309"; }; meta.homepage = "https://github.com/posva/vim-vue/"; }; @@ -15965,12 +16181,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-03-15"; + version = "2024-04-11"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "56b4d073adaf18c04c7bb5728d41c03b2f25754d"; - sha256 = "1qcx81hgamz4v7nxhbx0kbwsx2qm0b7rsgpja16imhycvlaf28n1"; + rev = "5d11a253dd1ecabd4612a885175216032d814300"; + sha256 = "1kx5xid8sybwc7fmmcn6j36r8n0m3g0529q5p0mywfn337m8q3np"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16181,12 +16397,12 @@ final: prev: vimagit = buildVimPlugin { pname = "vimagit"; - version = "2024-01-04"; + version = "2024-03-28"; src = fetchFromGitHub { owner = "jreybert"; repo = "vimagit"; - rev = "06afe48439d0118a77d622ef06eff0f7cd7d62ab"; - sha256 = "0apymanij1b75ajwnxdzmlsnb7h6ybsck0wrh86r55gnplba0jys"; + rev = "fc7eda97da4f8182c8abbe6ea7befbd789b8b935"; + sha256 = "0fxgkfyh0w78g02c3l9sgvjkmv4l9jzh15i00fw4frlm7h3sy9qy"; }; meta.homepage = "https://github.com/jreybert/vimagit/"; }; @@ -16290,12 +16506,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-03-15"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "577f7c59a4c0047ef354eb2f6fef39cbdc9a4556"; - sha256 = "0bglgaqdy6abdf4cnyyqqlh33d9537k1w6jmkzzb90q8mwlvy23k"; + rev = "268dd8d311adebb121fa0a4b31cdabcb98072403"; + sha256 = "1nd6yafqvdx0h7mad3pwfp3fxs8kssjyd758q3f99612fhl63c61"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16314,16 +16530,28 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2024-01-25"; + version = "2024-03-16"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "fde35bb87e45abe930eebef5ab99a16289e53789"; - sha256 = "0p9yfx6dg7pl96yjgyyqyyjjwdr781g0vnl7zhkxa1281sla5k9b"; + rev = "69318e74c88ef7677e2496fd0a836446ceac61e8"; + sha256 = "0z7bh2zc5mxf5rdma160sdawm1czdqfhm6rq9lj1780g5snvc0ps"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; + virt-column-nvim = buildVimPlugin { + pname = "virt-column.nvim"; + version = "2023-11-13"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "virt-column.nvim"; + rev = "b62b4ef0774d19452d4ed18e473e824c7a756f2f"; + sha256 = "sha256-7ljjJ7UwN2U1xPCtsYbrKdnz6SGQGbM/HrxPTxNKlwo="; + }; + meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/"; + }; + virtual-types-nvim = buildVimPlugin { pname = "virtual-types.nvim"; version = "2023-04-07"; @@ -16362,24 +16590,24 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2024-02-21"; + version = "2024-04-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "f76cecc430003968e6174cae899c2cb2953219b7"; - sha256 = "0hq41f91f97885vx1rcl981vhwariiwbz2hs0dzryka2ycy5lvy4"; + rev = "04fa99afe865b16324af94fd8a8391121117d8f7"; + sha256 = "0gjma1ba0ds0dznhqdajmhib1i49b08iv7hf0c4vjz833kcjagqj"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-03-13"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "ea9ff6da3756ab229bcb59aad1ea7749eb15b065"; - sha256 = "1m2zb5wzcdvhir7ijk49r210s7r6j8yzjgx9w60pqjh1pywi423x"; + rev = "d47aab1fbe423bf14275745684205dca08366277"; + sha256 = "0g4dh47rasd5973mjv8cpsd1c6bf5c1bv7pc05sbjkb8vck2lsl5"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16458,12 +16686,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-02-12"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "7d0eaf0037b01b0f8bcbb59286d58feac38bb4c8"; - sha256 = "1ibd0g6g110cvk287k7iw7fsz7w6j9g8fzrcmblxcspg5bpassy3"; + rev = "0035cd000cb2a5c60ea67c176ce795852ea04448"; + sha256 = "0xzxscvaflappikhi7l0v6i92cls6jp1y8fq2pfai9rnsyizvh7p"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16566,12 +16794,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2024-02-25"; + version = "2024-04-07"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "2b74a9fa326ad42e2a509f9e49543471d2d7c1ea"; - sha256 = "1v66hgmv05w5yz9bg4h5s00j1iz41pc09prm45xdbds6kx02rg2d"; + rev = "d1ac69c0db82ff0c7540088a0f91d74ad7378c3d"; + sha256 = "0cmvgmynr3jkp9ikygrn773f3j8n6580ajvv29p8lzg6h5pvafdc"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -16590,12 +16818,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2023-12-11"; + version = "2024-03-23"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "07f79bdffaa9dd2785fe2543da6d850e76d2709c"; - sha256 = "0gnrb8rqfd8filv74wj62cq5gfa8n36f2bv7m607rnggy0rzx58n"; + rev = "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33"; + sha256 = "1q0j06lkkg60f62bjqxq7x6a8wxgcqdh1ldi6rp5sg6rkad8kzd7"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -16685,6 +16913,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; + zellij-nvim = buildVimPlugin { + pname = "zellij.nvim"; + version = "2023-12-03"; + src = fetchFromGitHub { + owner = "Lilja"; + repo = "zellij.nvim"; + rev = "483c855ab7a3aba60e522971991481807ea3a47b"; + sha256 = "17lapf7lznlw557k00dpvx04j5pkgdqk95aw5js3aamydnhi976g"; + }; + meta.homepage = "https://github.com/Lilja/zellij.nvim/"; + }; + zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; version = "2024-01-21"; @@ -16699,12 +16939,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-02-10"; + version = "2024-03-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "33672310aac6b823c88cf16d5d99472439111f9c"; - sha256 = "0yc7rr54ywap910k6jzwv4kwjy7n7s3yfpd435gq8hlcci1fj5am"; + rev = "453ec69d82d644ee6998a3464da49d0261df9f80"; + sha256 = "006y9abl1l01ja6fr59gpxwybha9h0pda8160fwxciichynkld32"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -16747,12 +16987,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-01-05"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "fb0962b75a680561f94cae0588b8da92ea8d2fae"; - sha256 = "0xbxkm6inxi09fb0zj4zrbfi8iyhcjn6lfrwqvmym8fnvi5pmz4c"; + rev = "e2b6d62b18a88249016bf917d4e5bb0e417ac974"; + sha256 = "16mmrl34f1bsr1dfl1drg62wwycc23n9w0qczmqz7ylpgb6k8i02"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -16783,12 +17023,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-03-05"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "045e3499d9ec8d84635fb08877ae44fd33f6a38d"; - sha256 = "1l86f56lcb0rklg1mipa9ssvgipx02vl5f4d60m5xary72qsgcva"; + rev = "a1439ad7c584efb3d0ce14ccb835967f030450fe"; + sha256 = "1ngjll0khnx1nighazw64kvfdl139z8xhv0hh2r4bb40ynxnhdf9"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16807,12 +17047,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2024-02-23"; + version = "2024-04-14"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "9fa89296884e47bbadc49ad959e37b9d1c24cafb"; - sha256 = "0911akib9ys9vyxnalbmyip7m1ahpnsn89km2hrgj0fc9s5m75ky"; + rev = "28874a1e9d583eb0b1dfebb9191445b822812ea3"; + sha256 = "1answqiln7pg1f0cpgknjrnnzk4cslhn19vnv2hvji9xm45lvvbv"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -16831,12 +17071,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-02-01"; + version = "2024-04-02"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "4ae9eb96e9ee65493d4ade102dec7e4b4d4b8b21"; - sha256 = "1pipplqpmif0wmb9w782bq89dlqidjpi0l8dn1fddr3r7zn7xj48"; + rev = "a6f4979566e44a69ddc80c9df73e960af1ab1840"; + sha256 = "1fykygiq7izp19ylppvsw5v1i1rmy6x6abc5sjlls6wmcgz5dsvn"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -16855,12 +17095,12 @@ final: prev: harpoon2 = buildVimPlugin { pname = "harpoon2"; - version = "2024-01-26"; + version = "2024-04-09"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "a38be6e0dd4c6db66997deab71fc4453ace97f9c"; - sha256 = "1cmiw4sy5r4h8f2k1m91f2xykasnp66zdibx0l8vk94hw990sg26"; + rev = "0378a6c428a0bed6a2781d459d7943843f374bce"; + sha256 = "129d51cp89dir809yakiw0b7kkjqww7s5h437j8ppn1lq7ghg50m"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -16879,12 +17119,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-03-16"; + version = "2024-04-20"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "43ca56b9035be8b276889637c281f4d7d8833e1c"; - sha256 = "1if5l751gym0810ysbls1pp5c9b7il9vzqngzf4936bs9gw7wzql"; + rev = "a54ba6131c4e5feb47176efb78b1f93501df1572"; + sha256 = "1ajnyr7lwhmpjzdwni0hzgd46x64kgdgb3x0qjmvw2q456vs1fap"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16903,12 +17143,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-03-15"; + version = "2024-04-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "5a910659cffebf9671d0df1f98fb159c13ee9152"; - sha256 = "10zxpzi2xzniy128f7871dc309flsda69las1ngyv7nclzq5mdwz"; + rev = "6512f7d1faa4fd86c53e9c5c8492b4bdda692613"; + sha256 = "165yndfj0m3wib17wa15fswsfwixm1bxalprpbdwvyzd2f9p1fd0"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -16951,12 +17191,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-03-15"; + version = "2024-04-18"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "c52167563e6aa44b5fa6fe007faa2bcac71050f0"; - sha256 = "1sghyhmr0zsgd4qj1av8hxx9ca5kx9ks2zynrm13bnyr46kci73p"; + rev = "17b466e79479758b332a3cac12544a3ad2be6241"; + sha256 = "1fwwp7szzz2yp4z5hngqn8ll8765xv0nlhgcb75yj257kz7x5lq1"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17009,17 +17249,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - virt-column-nvim = buildVimPlugin { - pname = "virt-column-nvim"; - version = "2023-11-13"; - src = fetchFromGitHub { - owner = "lukas-reineke"; - repo = "virt-column.nvim"; - rev = "b62b4ef0774d19452d4ed18e473e824c7a756f2f"; - sha256 = "sha256-7ljjJ7UwN2U1xPCtsYbrKdnz6SGQGbM/HrxPTxNKlwo="; - }; - meta.homepage = "https://github.com/lukas-reineke/virt-column.nvim/"; - }; - } diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 5b454e0ff01b9..0c6a0010845d7 100644 --- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -10,7 +10,7 @@ neovimRequireCheckHook () { # editorconfig-checker-disable export HOME="$TMPDIR" @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ - --cmd "set rtp+=$out" \ + --cmd "set rtp+=$out,${dependencies/ /,}" \ --cmd "lua require('$nvimRequireCheck')" fi } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 518473b451241..42c846ee5ebc1 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=62179d7"; + version = "0.0.0+rev=b7a7167"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "62179d7bbfb5fd8a8f7298495ac654d252a1bd52"; - hash = "sha256-qRsBeJ01kGTKJqFubG1u9SFa1nsDH7ZHKQ0cGwfqi84="; + rev = "b7a7167762e3863b3d6247c708b7f9bca1ca7bea"; + hash = "sha256-GXjjRcB0ml9MMYuJUWAlORWrOUsRxrwZ6kmg0fp3kNQ="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -50,34 +50,34 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=e3a0a7f"; + version = "0.0.0+rev=4ddf79e"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "e3a0a7f60e544afc478b72cdda7ffc0f2f889db0"; - hash = "sha256-WdGCnZSMxyNJJYHB5H5Atc9EW2/0oB22/OWyxTrQHT8="; + rev = "4ddf79edaa87170ec12bd6a8d03a8ac528fe0ae7"; + hash = "sha256-DbxzbbmKq0GxbKIKtoygEhbdYeEwp23Nkk15WI2AQW4="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=6ace266"; + version = "0.0.0+rev=afdc3d5"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "6ace266be7ad6bf486a95427ca3fc949aff66211"; - hash = "sha256-sMUlk4BKpsmNhGF/ayi/wkSP6ea7pvTJKuctnOvKda0="; + rev = "afdc3d5da18d42cbb471c0f40527dbed9cace7ad"; + hash = "sha256-YYzJMGmizeqZxBF2YXYPLjAo54Y60z7RFhLcmOJbeGY="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=dfa0893"; + version = "0.0.0+rev=b422ccd"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "dfa0893bdc4bdfada102043404758c66e3580568"; - hash = "sha256-gToRdyLvvDaeE1b9fYRVPFt1mtdR9kSYzqFBDUYpv3k="; + rev = "b422ccd41f0b433260a3d28df7e39fa2ff63ef9c"; + hash = "sha256-FrXd4dR28GP1CAP+SaGSRO8TImok9MjVw2vWyZgUijQ="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -105,12 +105,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=f3f26f4"; + version = "0.0.0+rev=f8fb327"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f3f26f47a126797c011c311cec9d449d855c3eab"; - hash = "sha256-6Rfxh8Y6dg2wyQ9jYnbOaXm1SVfQDQ1B1tNqgpz6sY4="; + rev = "f8fb3274f72a30896075585b32b0c54cad65c086"; + hash = "sha256-sj1qYb42k0hXXcNCKg1hINYD11wDcVpnoPhZNtlYT6k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=6c665e7"; + version = "0.0.0+rev=c25f803"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "6c665e7cf15d76a1687959643868a78fb381458d"; - hash = "sha256-hVFPt+ndXx38SH/e/dORz226SQwDNu1j4cinvJLhkTM="; + rev = "c25f8034c977681653a8acd541c8b4877a58f474"; + hash = "sha256-j+TyGT5FycEj+E6si7GSKUauvXNvl1L2NEw98jU7jns="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -149,12 +149,12 @@ }; bicep = buildGrammar { language = "bicep"; - version = "0.0.0+rev=c3451d1"; + version = "0.0.0+rev=0092c7d"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bicep"; - rev = "c3451d1049c80074b18078ba50007b7c00e063f8"; - hash = "sha256-81Pt/Yyc/r8RDBCaGcXx9giIJ9+smi9Xus43NGOePgM="; + rev = "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0"; + hash = "sha256-jj1ccJQOX8oBx1XVKzI53B1sveq5kNADc2DB8bJhsf4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; }; @@ -182,23 +182,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=371fd0b"; + version = "0.0.0+rev=1aafaff"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "371fd0bf0650581b6e49f06f438c88c419859696"; - hash = "sha256-zaH4b5lsOtnl1e07ERU2mP/IFvg90YjsFFhvz+EY/ig="; + rev = "1aafaff4d26dac5a36dd3495be33e1c20161d761"; + hash = "sha256-eix/BqsZzrJc+h1sHiG/IDtdyZvIsEdox71sPMNXs58="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=4b4e82c"; + version = "0.0.0+rev=9de5652"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"; - hash = "sha256-NPF4nvryKvSmf4cI2xjYQiG391GqO0JoyymQCTXDjGc="; + rev = "9de565257ada70ac441c640e3b5d6850e2df5ab8"; + hash = "sha256-QNI2V1CG1DdkMIzR+NUcM/IjtQHnJcYn9Nk3sUmkINE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -215,12 +215,12 @@ }; capnp = buildGrammar { language = "capnp"; - version = "0.0.0+rev=dc28c9f"; + version = "0.0.0+rev=7b0883c"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-capnp"; - rev = "dc28c9f4212809eab74d10996086297853eb34e5"; - hash = "sha256-4GcOBC5JJsfbdsIrQd33tSW2sz6ytjYGqWgFVFLH6sc="; + rev = "7b0883c03e5edd34ef7bcf703194204299d7099f"; + hash = "sha256-WKrZuOMxmdGlvUI9y8JgwCNMdJ8MULucMhkmW8JCiXM="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; }; @@ -248,12 +248,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=7dc1582"; + version = "0.0.0+rev=20ffd6d"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "7dc15823107831729c64a917c796a93cf5c6a7e3"; - hash = "sha256-kz/FnQMibzmZ6O/x92q8IfrriO0vUlZhozIzhS0jRyo="; + rev = "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3"; + hash = "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -270,12 +270,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=cf10fc3"; + version = "0.0.0+rev=83ae738"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "cf10fc38bc24faf0549d59217ff37c789973dfdc"; - hash = "sha256-Pm8aZnsw2fKRA0Cz0sOdcWh2GX7ty3wy34OfUtxmBds="; + rev = "83ae738bed7e914cee9090c3fe4c80a32ab45905"; + hash = "sha256-0qWcrn65vtOYz54NVi/sj+GqnGMztEpZJsl9sjbF5sw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -303,23 +303,23 @@ }; cpon = buildGrammar { language = "cpon"; - version = "0.0.0+rev=f4b3cbc"; + version = "0.0.0+rev=594289e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-cpon"; - rev = "f4b3cbc8b0bd4e13035d39940fef09f1392e8739"; - hash = "sha256-Enxc0sdQS9vSZVvIQkkHxk/1bzT2denRk0+AZdDNnJ8="; + rev = "594289eadfec719198e560f9d7fd243c4db678d5"; + hash = "sha256-Nr+98yrDkOS5Yh/EFmBWV9Yhv2tPfHGb4pPlLUwc+k8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-cpon"; }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=e0c1678"; + version = "0.0.0+rev=72fd001"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "e0c1678a78731e78655b7d953efb4daecf58be46"; - hash = "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo="; + rev = "72fd00128f1c38319670cbf4bcedbba0dc849d96"; + hash = "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -348,12 +348,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=221179d"; + version = "0.0.0+rev=50a28f4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "221179d4287a2c24c08e4c67ff383ef67dc32156"; - hash = "sha256-e01PTB+SduikiiDvOW411v0pBXCqOFBWlu3HgmM6jFg="; + rev = "50a28f4600c559e3d19a1825e854dfe6dcac1d49"; + hash = "sha256-xVf9sD5CbXDn1Kw9vkgKd+hWmerQgHf7ntUtynRXpBo="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -370,34 +370,34 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=a33d400"; + version = "0.0.0+rev=750dde9"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "a33d400f025d6bbd37b4c681c93054976f579890"; - hash = "sha256-LUb+1dTj1IP5ZtWaWBT8UWnGEqb0DJodgbkwnT7xywk="; + rev = "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"; + hash = "sha256-Epw1QW4WS1le8OdQI0soO0VaDOgNveh7WTL4sol/cQU="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=1a31399"; + version = "0.0.0+rev=6da4647"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"; - hash = "sha256-iQCjzNVCglHP670yT2inJKG5m3pstTZZzzcN0feGpFs="; + rev = "6da46473ab8accb13da48113f4634e729a71d335"; + hash = "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=2087a5b"; + version = "0.0.0+rev=fb07e60"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "2087a5b965db2a9efabab958a27fd8ddf43038a2"; - hash = "sha256-mQDZ+klWpg7csDnrj9R/9OCzwlojZoXJHiK7NCAyXIs="; + rev = "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"; + hash = "sha256-DKC+aUkdz2eGrXCXzW751aleG4Fxwmjn2KetTCOQRDY="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -414,12 +414,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=c165725"; + version = "0.0.0+rev=710e881"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "c165725c28e69b36c5799ff0e458713a844f1aaf"; - hash = "sha256-qou5ow/Am/qyO0I1j74ojgnBonwmJriLCCeSNpTk7t8="; + rev = "710e881127512bda8157096e26c1f3e91702823a"; + hash = "sha256-BdRWI/7LiUS8z5LehaQgPVcdOPcEOJSmNHowtukHAQw="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -434,14 +434,25 @@ }; meta.homepage = "https://github.com/ColinKennedy/tree-sitter-disassembly"; }; + djot = buildGrammar { + language = "djot"; + version = "0.0.0+rev=63f176e"; + src = fetchFromGitHub { + owner = "treeman"; + repo = "tree-sitter-djot"; + rev = "63f176e7db5fca073b55b98b7e5e95afd1587fcb"; + hash = "sha256-8ksZvW0Gb3fZXUDA/uv3AzxDaD3s9B2ZyAIIp261jQg="; + }; + meta.homepage = "https://github.com/treeman/tree-sitter-djot"; + }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=33e22c3"; + version = "0.0.0+rev=439c3e7"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "33e22c33bcdbfc33d42806ee84cfd0b1248cc392"; - hash = "sha256-uCKzTTbJL9Ans3lCQbt2zApF+ERLbbu5D1WcyWJ6Gf4="; + rev = "439c3e7b8a9bfdbf1f7d7c2beaae4173dc484cbf"; + hash = "sha256-sW3fCCAXNak4JszEPgspZFfOHtUlqnW3eRxzHNfzInk="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -469,16 +480,27 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=c23bd31"; + version = "0.0.0+rev=96beba9"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709"; - hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4="; + rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; + hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; + earthfile = buildGrammar { + language = "earthfile"; + version = "0.0.0+rev=7d5cc9e"; + src = fetchFromGitHub { + owner = "glehmann"; + repo = "tree-sitter-earthfile"; + rev = "7d5cc9e27e3e340c8b521d11c8da84047494fe30"; + hash = "sha256-0rjD8SJGot/KAsLVW98e7X2tbNPntScRk/oEsS1wmAg="; + }; + meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; + }; ebnf = buildGrammar { language = "ebnf"; version = "0.0.0+rev=8e635b0"; @@ -515,12 +537,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=511ea5e"; + version = "0.0.0+rev=de690fa"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "511ea5e0088779e4bdd76e12963ab9a5fe99983a"; - hash = "sha256-gF+bhfaN45KmGGhLa4i2K8LiBLxY8n5fw2m6kYzx5xo="; + rev = "de690fa8a028f122af46d9d2685679fe5f2d7d60"; + hash = "sha256-bvbOWF+Fy3IhOPhkW6pB/3LcLXnPzqVQb8GOCCQWzw0="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -570,12 +592,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=54b6f81"; + version = "0.0.0+rev=20ce5a9"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "54b6f814f43c4eac81eeedefaa7cc8762fec6683"; - hash = "sha256-21pSBjg3hArexHndfqIOy5q2FGl54uWyW2fWwO+3jIw="; + rev = "20ce5a9234c7248b3f91c5b0b028f1760b954dde"; + hash = "sha256-5m4zWP1LPbcab73RIIXD8wG8y68s/rwFypOX7OEWgoQ="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -625,23 +647,23 @@ }; firrtl = buildGrammar { language = "firrtl"; - version = "0.0.0+rev=2b5adae"; + version = "0.0.0+rev=8503d3a"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-firrtl"; - rev = "2b5adae629c8cba528c7b1e4aa67a8ae28934ea5"; - hash = "sha256-If34GymYMJpSNtzSGpcq4dMxj8djKZ3B5uMHGx9uCnM="; + rev = "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5"; + hash = "sha256-I2EMcm6bTMRODmxOOOiv+U0fhm6yoNhjCyuINfTUtlY="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-firrtl"; }; fish = buildGrammar { language = "fish"; - version = "0.0.0+rev=f917690"; + version = "0.0.0+rev=a78aef9"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "f9176908c9eb2e11eb684d79e1d00f3b29bd65c9"; - hash = "sha256-nPWkKhhG5MvJPOJ5nhm7GXgjnWX71/Ay55rPW+uKu/s="; + rev = "a78aef9abc395c600c38a037ac779afc7e3cc9e0"; + hash = "sha256-D7s3ZsHQeGf+pYdbXvi5GMFqbkgajBuqTQwvjnjnrVo="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -713,12 +735,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "0.0.0+rev=b5dea4d"; + version = "0.0.0+rev=1f1e782"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "b5dea4d852db65f0872d849c24533eb121e03c76"; - hash = "sha256-/fmg7DfVX62F3sEovFaMs4dTA4rvPexOdQop3257op4="; + rev = "1f1e782fe2600f50ae57b53876505b8282388d77"; + hash = "sha256-HikAZVoOqKRNnEBv/CCqqyt94HbXg2dBq+4GsmUFSIA="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -768,12 +790,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=523a1a4"; + version = "0.0.0+rev=edd817e"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "523a1a4f0f674eff7fbf46addfa6ef7644151aae"; - hash = "sha256-QWWX/92yOZES1XgcCTu77tgcfeRhaUEJJudCCopMBrk="; + rev = "edd817e0532f179b7f7f371dc180629070945f0c"; + hash = "sha256-iipzgO8vJJpxhf/ZJh6tsfRa54C6g9rAN9TVdycKiqc="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -790,34 +812,34 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=2012f29"; + version = "0.0.0+rev=bcf9c45"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "2012f294baacf30e7a62414754021284377366c6"; - hash = "sha256-W+PfxqPUKHhLH5UBATmQ1mlSfLPAWIQyDgiSQBWBtBs="; + rev = "bcf9c45b56cbe46e9dac5eee0aee75df270000ac"; + hash = "sha256-XdgPPX5gKvr4yIpMy6M7AKxaMrilt5Pzp6gUa8o+EwE="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=f9746dc"; + version = "0.0.0+rev=6b25d26"; src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; - rev = "f9746dc1d0707717fbba84cb5c22a71586af23e1"; - hash = "sha256-57Sp4LrvyNNuOc+8ZiHl6cwvGg1tmXZemRsWeW+Kzys="; + rev = "6b25d265c990139353e1f7f97baf84987ebb7bf0"; + hash = "sha256-azLagXPC659Ee0UwqtW0XgpxGLqMSrwmKZy8htsp4xU="; }; meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=284bed0"; + version = "0.0.0+rev=e7817c9"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "284bed0e2f1d9f700756b96512baf33483642ff0"; - hash = "sha256-pyxMMXDwpu4IOXVzBX1LteD6pmRVCcijCyzMioqjlO0="; + rev = "e7817c982e0e921c5ee89a1e0283121bb5cc5e01"; + hash = "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -834,34 +856,34 @@ }; gnuplot = buildGrammar { language = "gnuplot"; - version = "0.0.0+rev=7549f6f"; + version = "0.0.0+rev=3c895f5"; src = fetchFromGitHub { owner = "dpezto"; repo = "tree-sitter-gnuplot"; - rev = "7549f6faf5cc9fb8cf78054a7af356a6b003c6f3"; - hash = "sha256-AnSOI1pAMHtlkK6VcRuTCEsnXP3Sm2O95Eiwdx15UzM="; + rev = "3c895f5d9c0b3a3c7e02383766b462c21913c000"; + hash = "sha256-szpXAHOcQjdk9mN87V69Jjdgj0aP/q7uRVza0yaK/uw="; }; meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot"; }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=fd577c4"; + version = "0.0.0+rev=eb68645"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"; - hash = "sha256-Fz9xSyjJLbNXAXbYMoVDsRqyRrLTWHAxnQBV9EF6n78="; + rev = "eb68645662a3f7bf7fdd4bcb9531585f54c8570e"; + hash = "sha256-RZx8M3QGX/+kfjbEB0+f2jeDZhGF+XGXwtb5oltxHrI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; godot_resource = buildGrammar { language = "godot_resource"; - version = "0.0.0+rev=b6ef076"; + version = "0.0.0+rev=2ffb90d"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; - rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; - hash = "sha256-ws/8nL+HOoPb6Hcdh4pihjPoRw90R1fy7MB0V9Lb9ik="; + rev = "2ffb90de47417018651fc3b970e5f6b67214dc9d"; + hash = "sha256-wdxCfG48fzswUg4q2pgI4q7jK7ZimpKo4+dRnZsZJ6U="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource"; }; @@ -933,23 +955,23 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=3c25d1c"; + version = "0.0.0+rev=6c5c881"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "3c25d1ce6c1eb9da34215060372792dc9f439b0c"; - hash = "sha256-VWIURpQoofmva6GWnOzq8niYklp5yOHH5ZuE8oDpzfs="; + rev = "6c5c8813233fe326e24c5ef032858d13f8006a8d"; + hash = "sha256-NursRJ7DBmlbA7EOzC+WwoxDkjMUZYANcdX48DyjEIY="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; gstlaunch = buildGrammar { language = "gstlaunch"; - version = "0.0.0+rev=2c0d9c9"; + version = "0.0.0+rev=549aef2"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-gstlaunch"; - rev = "2c0d9c94d35e37aa63fa5002163c8480985b3e5b"; - hash = "sha256-H5H1v4xJSPHW0oaTY/JczhfVmYExbrdfdugYkMJktPY="; + rev = "549aef253fd38a53995cda1bf55c501174372bf7"; + hash = "sha256-zNUx/9dxEqyqTXCxEiNnYPzplnR7l9b2L4frYpPOA9M="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-gstlaunch"; }; @@ -966,23 +988,23 @@ }; hare = buildGrammar { language = "hare"; - version = "0.0.0+rev=3d4af17"; + version = "0.0.0+rev=0705249"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-hare"; - rev = "3d4af179414525a35dd069ba0208c9b71093d8b3"; - hash = "sha256-RRi2uAE9rf0bjQrk8Asf6z+6ZDZYhEoKaX0m8hZnI9o="; + rev = "070524937539eb8bb4f10debd9c83b66c434f3a2"; + hash = "sha256-NUvbkMYA1nZmS84vLNguto/Fo7wdrDmRCBnveR88ry0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=6b5ec20"; + version = "0.0.0+rev=95a4f00"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a"; - hash = "sha256-TFI524Pb5RhoPLHJ0ucSKJcWJDmIX6PJELSHRd2ic7Q="; + rev = "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be"; + hash = "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1044,23 +1066,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=ee24be1"; + version = "0.0.0+rev=d200375"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "ee24be127560f0de0c4741e382416f45ab47eb76"; - hash = "sha256-FMmJpyburjO/NKq14bQ9LbvxuiYdjBt5/Gfm/jeye0U="; + rev = "d200375a29b24764b78d7051df0024ed7c2f1ab0"; + hash = "sha256-HCbH8Lyi2ziaUTxhgVPQ4hyOZhRxNFW66gAkoFT/Ubg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=5be34b0"; + version = "0.0.0+rev=3e65f65"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "5be34b0f6ea01b24f017c2c715729a3a919f57fd"; - hash = "sha256-3ZFaIc4BrfR7dLxftbSLuFdErjYrJgi0Cd8jp9PB19U="; + rev = "3e65f652b9dea8d38f9a44b5b0898a51c9247eb8"; + hash = "sha256-IGfKnEG1b9TSPBjxb+NjgweyKp7HUyZCe2gR/xnV5CY="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1077,67 +1099,67 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=0135187"; + version = "0.0.0+rev=a24c5a3"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "0135187126370cbf112d759a50eab4a5c913a827"; - hash = "sha256-9FHCBaHQ/iXL3asJ3OZD9Gc02kPtWPNlPyRXiaEhkMU="; + rev = "a24c5a39d1d7e993a8bee913c8e8b6a652ca5ae8"; + hash = "sha256-jBKgZaZpm81ufN32sRNsCRtZhI5m057J+UY1uQdZK3E="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=b285e25"; + version = "0.0.0+rev=bfa075d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be"; - hash = "sha256-bAFSq2FXtSvFY8FrpeDgXXSq66QZsUrdz1As07B45u0="; + rev = "bfa075d83c6b97cd48440b3829ab8d24a2319809"; + hash = "sha256-zUbcez+kWKJb7ZV8rC17NJ61P85hgA3HXtQCFevFwvs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=8873e3d"; + version = "0.0.0+rev=ea71012"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "8873e3df89f9ea1d33f6235e516b600009288557"; - hash = "sha256-zVpjgnP39ToEDf59Ldq/DhRVKZOGaWX+usVOcSsJX3k="; + rev = "ea71012d3fe14dd0b69f36be4f96bdfe9155ebae"; + hash = "sha256-z4PqUbUXOtqOyPYl2h+bWA0maZJqZd5aZB75og+Ye6A="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=6824a24"; + version = "0.0.0+rev=8d22f33"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "6824a247d1326079aab4fa9f9164e9319678081d"; - hash = "sha256-QYSdrngNBvDNYpPJ1da4pzXk8PtBidn+u0KPLmm7EW4="; + rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; + hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=cd1a0ad"; + version = "0.0.0+rev=ad705af"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"; - hash = "sha256-vu/zK/AILJXPn18TmQSKoap7BtUOwhCxAX9v8ekVrIo="; + rev = "ad705af8c44c737bdb965fc081329c50716d2d03"; + hash = "sha256-Pdk7wGaTtQHola+Ek5a7pLBfRUEJfgx+nSunh7/c13I="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=fc1d331"; + version = "0.0.0+rev=e5da7d0"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "fc1d331586e4da2b5f5bcfa89d630ebafe66458b"; - hash = "sha256-powQTRaYmGGEdkmt59kLfdbLZRkRFbGra6PRnno0AUo="; + rev = "e5da7d0aa44403153e0394d87d9edea4e5bd6609"; + hash = "sha256-jKp880I0XkApB3aFINAPfwn1txuMwalh4NrLUHan3H4="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; @@ -1176,23 +1198,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=5e62fbb"; + version = "0.0.0+rev=953abfc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "5e62fbb519b608dfd856000fdc66536304c414de"; - hash = "sha256-Wki+tdLzYINDbZMFd79QIDNK46rtzx25Qy0mB54eWN4="; + rev = "953abfc8bb3eb2f578e1f461edba4a9885f974b8"; + hash = "sha256-COrEPsdTI6MJeb5iIZtyNHHe6nMsD/EnHDRVDTSKFTg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=de1e682"; + version = "0.0.0+rev=fff4560"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "de1e682289a417354df5b4437a3e4f92e0722a0f"; - hash = "sha256-HhqYqU1CwPxXMHp21unRekFDzpGVedlgh/4bsplhe9c="; + rev = "fff4560044bdc51d9f6995f1edc797b7cd72b9dc"; + hash = "sha256-erxZ5nYvUwrzdRnkni8WEsxB04ghI7H3DLASfCoHXYs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1220,12 +1242,12 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=3b12920"; + version = "0.0.0+rev=80e623c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"; - hash = "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY="; + rev = "80e623c2165887f9829357acfa9c0a0bab34a3cd"; + hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1264,15 +1286,26 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=e84f10d"; + version = "0.0.0+rev=acd5ca1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"; - hash = "sha256-jrQjVPLb6SfePxEJV1GgFgLslGxgdmdb8bJy6VHOEbs="; + rev = "acd5ca12cc278df7960629c2429a096c7ac4bbea"; + hash = "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + just = buildGrammar { + language = "just"; + version = "0.0.0+rev=6c2f018"; + src = fetchFromGitHub { + owner = "IndianBoy42"; + repo = "tree-sitter-just"; + rev = "6c2f018ab1d90946c0ce029bb2f7d57f56895dff"; + hash = "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw="; + }; + meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; + }; kconfig = buildGrammar { language = "kconfig"; version = "0.0.0+rev=486fea7"; @@ -1319,24 +1352,25 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=456dec2"; + version = "0.0.0+rev=123d8b4"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "456dec2990ed7e9595eca82f85db14a1db46e126"; - hash = "sha256-9lBgCmXfsvNZiI6KzOxLE4S9Eh2B6FSAMX3d5Oz9mQg="; + rev = "123d8b472e949b59f348c32e245107a34a3d8945"; + hash = "sha256-+06eppRj7TynVYOMs30/7kUM69RqdmryIoBuiZJ7DvY="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=841f89f"; + version = "0.0.0+rev=ae2134a"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "841f89ffbba9650529a40fb867f3456bf92bf9b1"; - hash = "sha256-OVPWwjRD/pYHk+iBskVuvum8+mNjIbAqJOMU22VE7CY="; + rev = "ae2134af67f6c5e45587ace9ec748dd6e7b356a2"; + hash = "sha256-hQaQBQYK0o5qRH5Mjv3pIAUHJe6BWHGzg2I4KCVG2KE="; }; + generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; ledger = buildGrammar { @@ -1372,14 +1406,25 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-linkerscript"; }; + liquid = buildGrammar { + language = "liquid"; + version = "0.0.0+rev=2933698"; + src = fetchFromGitHub { + owner = "hankthetank27"; + repo = "tree-sitter-liquid"; + rev = "293369818da219d97327908aab33707b04b63fd9"; + hash = "sha256-RmpVKvQfk4IQuE3KOTL3nbBS7LSpBlvMpl5JDAAKb5Q="; + }; + meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; + }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=fb062bf"; + version = "0.0.0+rev=09a9e31"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "fb062bfc7ca09a741820debb7cb8a75a557b30f9"; - hash = "sha256-Q3ML8h6GU3KxL0G7JUAKwqNVgQBtDeQJANKF5h+MApQ="; + rev = "09a9e31e2af734a8974dad6ed349648f601eee8c"; + hash = "sha256-GQIi1PFYFlOBkUOGYWQG6M0A+ve3IBl/G0rCcAVyRKM="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1429,12 +1474,12 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=e5f7a02"; + version = "0.0.0+rev=5b088fa"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "e5f7a020967407f73959592decdb147bb5fc30bb"; - hash = "sha256-5Tnqt4PA3xX2Gk0CvlzVpWXI3OcqzsIJov4Kn0EWN+w="; + rev = "5b088fac748f2666a315cafd1638a214388eb23e"; + hash = "sha256-m0xHQu9nxjyrCMza9Aw/kRK8Rlhtc2DRbtyyFtMZkJU="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; @@ -1462,24 +1507,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=b2f0198"; + version = "0.0.0+rev=7fe453b"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "b2f01981a76e3251f5b660378136c248ed106b81"; - hash = "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA="; + rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; + hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=b2f0198"; + version = "0.0.0+rev=7fe453b"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "b2f01981a76e3251f5b660378136c248ed106b81"; - hash = "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA="; + rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; + hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1508,46 +1553,46 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=e8dac87"; + version = "0.0.0+rev=49442bd"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"; - hash = "sha256-1FCc8goKhFtgxSPeAzFkQhpbpruhZ+GD8VaLRJpnyS4="; + rev = "49442bd087901c60f019b4e34dcb6ecdc8849067"; + hash = "sha256-KoAoEuADv6Xj/bpZV5XGW7nXugSCfk6St2xzx7x2oPA="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=d6ec8ce"; + version = "0.0.0+rev=bd17c82"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "d6ec8ce0963c3c8180161391f15d8f7d415f650d"; - hash = "sha256-SwcBhg6luPAOtaL5dhvLxCpJcwlGhZxhvVmn5pa6ecA="; + rev = "bd17c824196ce70800f64ad39cfddd1b17acc13f"; + hash = "sha256-+RqhCA+WoE2Lnk9vGiAYcdvl+ovxX5kaJhQ8m9H/fvo="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=992c756"; + version = "0.0.0+rev=c2845c1"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "992c756686eb968af752ce75a874591042a8e24c"; - hash = "sha256-nm7YSwj10p6GKR7lUJZ5SZeiW8fh+5ZI52haeUM3oDE="; + rev = "c2845c1c0b23e2faf6febfa72a042e5346374ebf"; + hash = "sha256-SQR/1lAWdvNDwa40wNI3uGSF9OBgtyjxVM5lsP4CgIU="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=67d9e23"; + version = "0.0.0+rev=1a3d3c9"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"; - hash = "sha256-B3/VoPq8h7TiwOP0nhsuPmFtkLsucpDm9RnUNXkfKpo="; + rev = "1a3d3c98de86689f2bb1e59c8db8067c6784aaed"; + hash = "sha256-9RFz8qaAapJSNxy8YH/6FZG2j1tcrhNWRhxx+fNo7z8="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; @@ -1575,12 +1620,12 @@ }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=f5cec6a"; + version = "0.0.0+rev=961c279"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "f5cec6a841b585e4e7388a120ded07e60ae19c43"; - hash = "sha256-CL041Tjw7CH9EnpjAVl4f66zyOADfG9qwkFxeUjXH0w="; + rev = "961c2798cec9250c44f7d7225ddb33d47d25856a"; + hash = "sha256-zFT316pJwJvPRLJcBk4kvPmwNgdkYG5/10VktNBQwL8="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1608,23 +1653,23 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=763168f"; + version = "0.0.0+rev=b3cda61"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "763168fa916a333a459434f1424b5d30645f015d"; - hash = "sha256-MarXhVPVmL505c57HkbUk0kHN7jez83mcGtyM5GMw1o="; + rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; + hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=014073f"; + version = "0.0.0+rev=aa1a1a7"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "014073fe8016d1ac440c51d22c77e3765d8f6855"; - hash = "sha256-0wL3Pby7e4nbeVHCRfWwxZfEcAF9/s8e6Njva+lj+Rc="; + rev = "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"; + hash = "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1663,26 +1708,26 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=712d9bf"; + version = "0.0.0+rev=0b12614"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "712d9bfa1d537c5899dde5538767ed2d8bb37a93"; - hash = "sha256-l4hchr03Jrsat863K8wfBeHo1o9dw0T3RAl4MMWKIHA="; + rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; + hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; }; - location = "ocaml"; + location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=712d9bf"; + version = "0.0.0+rev=0b12614"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "712d9bfa1d537c5899dde5538767ed2d8bb37a93"; - hash = "sha256-l4hchr03Jrsat863K8wfBeHo1o9dw0T3RAl4MMWKIHA="; + rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; + hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; }; - location = "interface"; + location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocamllex = buildGrammar { @@ -1699,12 +1744,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=f94c590"; + version = "0.0.0+rev=b5f668e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "f94c590ed5263e11f1e492d1b53356f8c8459b66"; - hash = "sha256-MLSy1OU8PE2wTfV8JoJdtjoc12MD993TViaZjp3Ujgc="; + rev = "b5f668ef8918aab13812ce73acd89fe191fb8c5e"; + hash = "sha256-D/+ls8a5efAy3sBaH1eGEifEwBRmz+6bYIMGNji949Q="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1721,12 +1766,12 @@ }; pascal = buildGrammar { language = "pascal"; - version = "0.0.0+rev=9e99540"; + version = "0.0.0+rev=a9ee969"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "9e995404ddff8319631d72d4b46552e737206912"; - hash = "sha256-y8xPnVZ15+eAnjrLSGjS5wIbLgSKbz9bipgL0o8acmA="; + rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; + hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; }; meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; }; @@ -1754,35 +1799,35 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=6526e5d"; + version = "0.0.0+rev=96a17c4"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "6526e5d5bf31501de0dc51c42ac3583078a8fdab"; - hash = "sha256-jqLYYHpcwt2ctcz6zbgyhG6p3yRLHvr9TlUMky2cfaM="; + rev = "96a17c4c2dd345dc61f330d040684538d634bbc2"; + hash = "sha256-I/76AfSPU5WOwch8inBWojIraJGVffnGvOpQepq6qYU="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=ad414fa"; + version = "0.0.0+rev=29838ad"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ad414fa5497328e96ef992d80896f19c77584f7c"; - hash = "sha256-is5jtMg3G4ay+yF1Eti0jDljlB4vmibLPW0qup+8VeU="; + rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; + hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=ad414fa"; + version = "0.0.0+rev=29838ad"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ad414fa5497328e96ef992d80896f19c77584f7c"; - hash = "sha256-is5jtMg3G4ay+yF1Eti0jDljlB4vmibLPW0qup+8VeU="; + rev = "29838ad107f50b1f5f51a0beefa9c9d834fce2b3"; + hash = "sha256-5bFM2Hr6vgpLyv3phgBWFl5wk+mlCPJTqrkXJvjSvvM="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1811,12 +1856,12 @@ }; po = buildGrammar { language = "po"; - version = "0.0.0+rev=d6aed22"; + version = "0.0.0+rev=bd860a0"; src = fetchFromGitHub { owner = "erasin"; repo = "tree-sitter-po"; - rev = "d6aed225290bc71a15ab6f06305cb11419360c56"; - hash = "sha256-fz4DGPA+KtOvLBmVMXqwnEMeXhupFecQC1xfhMbWCJg="; + rev = "bd860a0f57f697162bf28e576674be9c1500db5e"; + hash = "sha256-/St0VxDTAF872ZlBph1TukRoO0PBIOMT0D11DZ6nSLQ="; }; meta.homepage = "https://github.com/erasin/tree-sitter-po"; }; @@ -1844,12 +1889,12 @@ }; pony = buildGrammar { language = "pony"; - version = "0.0.0+rev=16f930b"; + version = "0.0.0+rev=73ff874"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-pony"; - rev = "16f930b250433cfcd4fb4144df92bb98ad344c20"; - hash = "sha256-UamgLmI1aI5e/JlGVZzFCPgDol8MnFomncrFKhQYLsk="; + rev = "73ff874ae4c9e9b45462673cbc0a1e350e2522a7"; + hash = "sha256-/9bTbep2AXLoiijeft9amMeFQ6fHXzItjH+bD/w6pDo="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; }; @@ -1944,12 +1989,12 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=5849f96"; + version = "0.0.0+rev=584522f"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "5849f9694197a6e822872945b415429c285fdd54"; - hash = "sha256-Lwfiby7amjTIOz8QRoC4RdZyFPfFikmQ2sqta4akyH8="; + rev = "584522f32495d648b18a53ccb52d988e60de127d"; + hash = "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; @@ -1977,12 +2022,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=b8a4c64"; + version = "0.0.0+rev=a227610"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "b8a4c64121ba66b460cb878e934e3157ecbfb124"; - hash = "sha256-ZTqWyr4+pOyXY4X/WnYdn9Sgp7T8FEEUy/TQPuFqb4k="; + rev = "a22761025cdac6c314b7e3aa48fb44fa9e594d6a"; + hash = "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2021,12 +2066,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=176a380"; + version = "0.0.0+rev=2e31ca2"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "176a380df78800167565118bb0dadfc961abbd43"; - hash = "sha256-b9M213q6dmuK65llDTMW7rksrOyTEzlE0kdAVv0fDnA="; + rev = "2e31ca2771f6042b0e4e0c41a6290014a9e1face"; + hash = "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2043,12 +2088,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=b5a2fe7"; + version = "0.0.0+rev=171f52a"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "b5a2fe74cac87dc5342b366f50db71d421e7cf8f"; - hash = "sha256-TPQw9Yd194tTD2k+qzzGjMInCAJ9WeZuRPRD96zLGzs="; + rev = "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"; + hash = "sha256-iuigtcakpqm5vPuxsSV5PR32pwzyPMmldYXaJmzO3d0="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2151,25 +2196,36 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; + roc = buildGrammar { + language = "roc"; + version = "0.0.0+rev=7df2c08"; + src = fetchFromGitHub { + owner = "nat-418"; + repo = "tree-sitter-roc"; + rev = "7df2c0892e62efb81a7504d9799d4e0d0443d241"; + hash = "sha256-8HJH63NcSuqmPviVWO+UE27ydoU7vRXEIXSTjKLSYvk="; + }; + meta.homepage = "https://github.com/nat-418/tree-sitter-roc"; + }; ron = buildGrammar { language = "ron"; - version = "0.0.0+rev=ce6086b"; + version = "0.0.0+rev=f0ddc95"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-ron"; - rev = "ce6086b2c9e8e71065b8129d6c2289c5f66d1879"; - hash = "sha256-4ZKhJ3qvKWwINQIWJLqgPwfnDvQBWzeZb2dZY7imYfc="; + rev = "f0ddc95a4b7bb21a7308642255a80f5496e69c5b"; + hash = "sha256-Wi81LYFfQXjZzj2OuxB64sNDEim/eZKViMeQ0h/w88k="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-ron"; }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=3ba9eb9"; + version = "0.0.0+rev=5120f6e"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "3ba9eb9b5a47aadb1f2356a3cab0dd3d2bd00b4b"; - hash = "sha256-0w11mtDcIc2ol9Alg4ukV33OzXADOeJDx+3uxV1hGfs="; + rev = "5120f6e59284cb8b85b450bd2db0bd352635ba9f"; + hash = "sha256-PI1C0W8fiuIQ2fgHXDelkCa0ng1a32x/9hrA33KoefM="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2186,23 +2242,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=3a56481"; + version = "0.0.0+rev=b77c0d8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "3a56481f8d13b6874a28752502a58520b9139dc7"; - hash = "sha256-6ROXeKuPehtIOtaI1OJuTtyPfQmZyLzCxv3ZS04yAIk="; + rev = "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b"; + hash = "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=70b4fe6"; + version = "0.0.0+rev=b76db43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "70b4fe63c4973b04cc7bd40c6b7646d9c2430db8"; - hash = "sha256-ZwrsEhlZGVJMP+GRIlaxGqS1b7HtiQelg3QBwJT9Igk="; + rev = "b76db435a7f876cf1ede837d66054c534783c72f"; + hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2220,12 +2276,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=6c77a5b"; + version = "0.0.0+rev=8f9dff3"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "6c77a5bcfb9baceeaa79ef67354b2d501b37b085"; - hash = "sha256-HIZ8j8a5ejB87rTBaMpNGRGL0TGqXiuV/BxfU4aj17s="; + rev = "8f9dff3d038f09934db5ea113cebc59c74447743"; + hash = "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2242,36 +2298,36 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=0cdfb17"; + version = "0.0.0+rev=b950ddf"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "0cdfb1741323f38e9a33798674145c22cfc0092b"; - hash = "sha256-1xSnb3n9u45B2gEBApZpZlb1VvbJOrmgQwrPL2OuGro="; + rev = "b950ddf54c564fec0efead602268b6e0d3e5f26e"; + hash = "sha256-AYZ7MlAh9AEvyHsGw6stiJFSEb4/FDLfuqFPhpAorAA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=f5fa844"; + version = "0.0.0+rev=d5fbeaf"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "f5fa844d2adbcfdc7a0ec4daae4539887959d9ff"; - hash = "sha256-MSIQd1Xb4ug4yZk2bQFPHMZxrqe1xke6X7LKsxtkIkc="; + rev = "d5fbeaf0c26683f1417d00b6a5ab1cca445031f2"; + hash = "sha256-ECzYJue7tKx9Eg043fl5x18ySvPlkWPU21Ga2Zqunv0="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; smali = buildGrammar { language = "smali"; - version = "0.0.0+rev=72e334b"; - src = fetchFromSourcehut { - owner = "~yotam"; + version = "0.0.0+rev=3f65178"; + src = fetchFromGitHub { + owner = "tree-sitter-grammars"; repo = "tree-sitter-smali"; - rev = "72e334b2630f5852825ba5ff9dfd872447175eb5"; - hash = "sha256-vV+4Q2IyWyw/GN8bmgHJmSEHhpjUWHkL2yschPI9fiU="; + rev = "3f6517855898ef23023e5d64a8b175d4ee8d646e"; + hash = "sha256-K1cRK4D0BE9FNq1tpa0L3Crc+8woXIwhRPg86+73snk="; }; - meta.homepage = "https://git.sr.ht/~yotam/tree-sitter-smali"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-smali"; }; smithy = buildGrammar { language = "smithy"; @@ -2286,23 +2342,23 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=65a6c3b"; + version = "0.0.0+rev=ba1b386"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "65a6c3b4671877821082164da0a310851b211953"; - hash = "sha256-NfbRqT3wB6gncrbL/Kx2Qtk7k5lXK2KwdQ4aOV0Acx8="; + rev = "ba1b3868eaa960b945593404af9a7c2f296d3643"; + hash = "sha256-7xYevZTRZwhotT2rBigrRT4w5j4TVgyB416a2XWTL+I="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=b239a95"; + version = "0.0.0+rev=1653da0"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "b239a95f94cfcc6e7b3e961bc73a28d55e214f02"; - hash = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; + rev = "1653da09ccd183f4312fba819056a13af22a65f6"; + hash = "sha256-1IW04F6CxTIdGHxRocM1QmfgXHHf5Jn/eaZ6M8o2EU8="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2354,34 +2410,34 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=cdb7cde"; + version = "0.0.0+rev=25f94f9"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "cdb7cde9bf70b194ab8beb5069fbbc3c9640284e"; - hash = "sha256-yxr+AbKp4pkVpjMQXL3P5VEzSo2Ii6yE7ceEBYiDHJA="; + rev = "25f94f998de79bae9df28add9782f9ea6ea0e2b8"; + hash = "sha256-UmGvjtN0Pi7uH8+Sb6JbvdV60gow7KQCbDRcKo3nMYw="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; squirrel = buildGrammar { language = "squirrel"; - version = "0.0.0+rev=e8b5835"; + version = "0.0.0+rev=f93fd28"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; - rev = "e8b5835296f931bcaa1477d3c5a68a0c5c2ba034"; - hash = "sha256-wKefWCqcQcg7zLT6abaDC9lWoJiJp7EbbsBOWRRsWFQ="; + rev = "f93fd2864dd05cc39b0490145fd86a1a93bfa3a3"; + hash = "sha256-06cmaCyBkdwSmIHSEE0xr9V4M6pp+ApIZNopbnW3pok="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=514695d"; + version = "0.0.0+rev=77450e8"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "514695df4985f56455b8f139a319453a2325cdcf"; - hash = "sha256-LDqRP8FA5m1tnbGNTxItQlp6B6U+M6gOBlbi4zX0FHI="; + rev = "77450e8bce8853921512348f83c73c168c71fdfb"; + hash = "sha256-V7JI1o30+mzGA4X1oh+pyu3rSWOfHFKfCUbYaFPLOmM="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2409,12 +2465,12 @@ }; styled = buildGrammar { language = "styled"; - version = "0.0.0+rev=5e52758"; + version = "0.0.0+rev=c68a457"; src = fetchFromGitHub { owner = "mskelton"; repo = "tree-sitter-styled"; - rev = "5e52758b32e02adca16bb93f95b3f9c050c72b56"; - hash = "sha256-3x/ZKVYyWuLGkgdm9HutI16m8xpJKSMOZHY48WqH9b0="; + rev = "c68a4572e2d6403b6e99066c9a113b43f4a07a27"; + hash = "sha256-ZOMHyhtlKVOty+0lyUX7aJiwyP9yNN+r0eXVhpu22WQ="; }; meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; }; @@ -2442,23 +2498,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=04a126d"; + version = "0.0.0+rev=2c97326"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "04a126d9210def99f06d9ab84a255110b862d47c"; - hash = "sha256-F6AC72IHMKs1jTwshwNkAXFfiBGEbBn7m83xedCoDsA="; + rev = "2c97326cd96b7c3016c3d249e8dc244c89b4abeb"; + hash = "sha256-rlfLelXjNLtQ2/UACwxB3QO5l+QYFLsfGnBaxTAtgTE="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=78a736d"; + version = "0.0.0+rev=e2f0b7c"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "78a736d77094b0b3c35e811e6765c4d38a72724e"; - hash = "sha256-cBUBmXc+mhub5jvGKPcCgHgZPQtxF6OD+dlKQ0ZaxpY="; + rev = "e2f0b7cf8136b801e4743790b7a956ab29a4d6b0"; + hash = "sha256-DFoNyZmpzSDI37Gto2DxeoRZuDgLtx9NJxyYGIG6lrY="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2487,34 +2543,34 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=0a457a5"; + version = "0.0.0+rev=6182836"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "0a457a557be7779336bc8ac2b396e73797bc68f7"; - hash = "sha256-ylMJ177FYVcnfaXbnOieNP1Emq8HpeAgEddt96tBJqE="; + rev = "6182836f4128725f1e74ce986840d7317021a015"; + hash = "sha256-w9X/CL5X6Lwr4/GGVQcMZ1O2HfJmdNiVjRQKGZHrRqg="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; tablegen = buildGrammar { language = "tablegen"; - version = "0.0.0+rev=300f6a4"; + version = "0.0.0+rev=6b7eb09"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-tablegen"; - rev = "300f6a490e71f895e644ed2deec6920860a2e107"; - hash = "sha256-V4fEmiGPBAnZO+NAyA7FdlyjLSA0ByUfrCTbsdDOxc8="; + rev = "6b7eb096621443627cc5e29c8c34ff1fde482cf3"; + hash = "sha256-kdOqHAyKAI4IgI2/GbEx13DWLB8JklURd3ndaicxUno="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; tcl = buildGrammar { language = "tcl"; - version = "0.0.0+rev=56ad1fa"; + version = "0.0.0+rev=8784024"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-tcl"; - rev = "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8"; - hash = "sha256-GhK92+nbJ+M5/1ZnPbIJ3EuNub332YK+hyWiwyBqUmk="; + rev = "8784024358c233efd0f3a6fd9e7a3c5852e628bc"; + hash = "sha256-/uw+Nb5A+DklN+BxMpufSCMb/VOE/zqJNnLZVFwjWtc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; }; @@ -2532,12 +2588,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=592faa3"; + version = "0.0.0+rev=e2218a2"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "592faa3186ef857c92e4bd1c31d73c07a4a334db"; - hash = "sha256-XX1+P8ibo8REYYZQaC47lneg/roralo+YiRwFNnARsQ="; + rev = "e2218a2376e3ff18c9963b21aa567770baab0462"; + hash = "sha256-lyxXb71FVfpWw4IbU5P6uDVETNSDO+r7+YgZDvaIEbc="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2566,12 +2622,12 @@ }; thrift = buildGrammar { language = "thrift"; - version = "0.0.0+rev=d4deb1b"; + version = "0.0.0+rev=68fd0d8"; src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; - rev = "d4deb1bd9e848f2dbe81103a151d99e8546de480"; - hash = "sha256-MCa7319E8bo3r2kDClBmjOvvs+yZDlE1E+52WqJqvMI="; + rev = "68fd0d80943a828d9e6f49c58a74be1e9ca142cf"; + hash = "sha256-owZbs8ttjKrqTA8fQ/NmBGyIUUItSUvvW4hRv0NPV8Y="; }; meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; }; @@ -2588,23 +2644,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=3896a5b"; + version = "0.0.0+rev=410122a"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "3896a5be761f04ffb22a841b2a0672f7a8a43ef9"; - hash = "sha256-EODxn3ZitUSz8/4XkgMK0dp2T07BwlsXVbFbBQ5xXi4="; + rev = "410122a012abb06fbacc8c0b8f288b684f8113e1"; + hash = "sha256-vWxMaka5h8L+tJctiflEWT1/nofPYHIgpf1/3jfsgVU="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=10737f5"; + version = "0.0.0+rev=1415bd8"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "10737f5dc4d8e68c9667f11a6996688a1185755f"; - hash = "sha256-7MQYyWu1Rw3Vwmp3nbuorn9rD0xcEU5nRXPuTVpOqkM="; + rev = "1415bd8b5bb69c230947663deceb62c2a0ae4155"; + hash = "sha256-3kF6H3tP20FUfNoIRxQCnVzvyd4MFLd9oN6rhB/ePvo="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2701,12 +2757,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=3c3e5f8"; + version = "0.0.0+rev=13863dd"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "3c3e5f8e0caeba6157e26a1bedf8321e1da62799"; - hash = "sha256-9XbFIvZvmeeR38Kejt8Yyxidy/XiAtZ5aQMt/rfg4JE="; + rev = "13863ddcbaa7b68ee6221cea2e3143415e64aea4"; + hash = "sha256-n6RTRMJS3h+g+Wawjb7I9NJbz+w/SGi+DQVj1jiyGaU="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2734,12 +2790,12 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=fb49b81"; + version = "0.0.0+rev=a1eba0f"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "fb49b8125509c079e08f345758c03a427129010e"; - hash = "sha256-Y4Pnte9ZxXq7tzjc+cliXO8U57cnHlQxOMuX8u39ptE="; + rev = "a1eba0fef887800de97126e2c9ae4109c1c6a2ea"; + hash = "sha256-p0LArEOspQvpgNponLpMakEHrwHM+UzA9SU5PdwQCTU="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; @@ -2768,12 +2824,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=be121f7"; + version = "0.0.0+rev=7e11a6f"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "be121f724e4f3e2159dfa193c876be605c1de7fa"; - hash = "sha256-nOWhtoPoVjfPitOMxTiU8Y3dBKT3GwGswRFmVYkcZ2E="; + rev = "7e11a6f8f369df935664fadd2f0c99d90fe3226f"; + hash = "sha256-zCXfYW8NCsdqKKEMkZUudpCEQM4bLePyCGFS0w86DY0="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -2789,6 +2845,17 @@ }; meta.homepage = "https://github.com/vala-lang/tree-sitter-vala"; }; + vento = buildGrammar { + language = "vento"; + version = "0.0.0+rev=3321077"; + src = fetchFromGitHub { + owner = "ventojs"; + repo = "tree-sitter-vento"; + rev = "3321077d7446c1b3b017c294fd56ce028ed817fe"; + hash = "sha256-/U8hZiYC9/pWscAYDIFgttLDMTq6RLNuHKNTZ/Q4bAc="; + }; + meta.homepage = "https://github.com/ventojs/tree-sitter-vento"; + }; verilog = buildGrammar { language = "verilog"; version = "0.0.0+rev=2dfddfc"; @@ -2824,23 +2891,23 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=f431bfa"; + version = "0.0.0+rev=0b36856"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "f431bfa7d433f4d629943147817193a4fccbd303"; - hash = "sha256-+SYbYvmVN2U0Q03p0eCj3MViCyzPqUiPG1oMWh7hRyM="; + rev = "0b36856db88680f662cc67545c82af4ce83bf158"; + hash = "sha256-8kq1Y+WXL6qu8CyS5zmE7pe/a0K5rmiGgZMxj5O/VHY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; vue = buildGrammar { language = "vue"; - version = "0.0.0+rev=3b9d520"; + version = "0.0.0+rev=22bdfa6"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-vue"; - rev = "3b9d52087100bdfce43dad2ca46d75b0e21613f6"; - hash = "sha256-36MnM1X8uhqCb44oHY0kEKDLpYmU1QL2JfGpdIbb3pc="; + rev = "22bdfa6c9fc0f5ffa44c6e938ec46869ac8a99ff"; + hash = "sha256-LnmUtJJpBIZPTJqrQQ7WI8V44hPw3yxR+j2jR0pHIdY="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vue"; }; @@ -2857,27 +2924,36 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=cbd58ee"; + version = "0.0.0+rev=f5980f5"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "cbd58ee33e24f46d16b9882b001eefb25a958ee2"; - hash = "sha256-EPpI4UJ/5GB2iDQGoSziUOcP1TVf7VU4FMTKvrujcAY="; + rev = "f5980f534ee64256b1e64b0a42e2864d91154a5d"; + hash = "sha256-LbysBXujWWDVtgyHte9RLOPu/LMk1TN/9DC0t0WWdcQ="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=07f6740"; + version = "0.0.0+rev=bd1d35c"; src = fetchFromGitHub { owner = "winglang"; - repo = "wing"; - rev = "07f6740ab9f4f74c49413b9056154cac51f4b2d7"; - hash = "sha256-jnDrJhhsfRAqR+83VaGXBKANu5J2Xt7LNUm0VUFEVbY="; + repo = "tree-sitter-wing"; + rev = "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"; + hash = "sha256-jygMTswZ8r4tUJQ0lUH8GHz56dyGd6rV1wL5i75Ni88="; }; - location = "libs/tree-sitter-wing"; - generate = true; - meta.homepage = "https://github.com/winglang/wing"; + meta.homepage = "https://github.com/winglang/tree-sitter-wing"; + }; + wit = buildGrammar { + language = "wit"; + version = "0.0.0+rev=6f511f9"; + src = fetchFromGitHub { + owner = "liamwh"; + repo = "tree-sitter-wit"; + rev = "6f511f9c6676e597c2f0930e4d2629595319882d"; + hash = "sha256-xvMIcbeYdr/KIz0fqnARAwEKWmm4dlWhFAS/NZFU16s="; + }; + meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; xcompose = buildGrammar { language = "xcompose"; @@ -2892,24 +2968,24 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=c23bd31"; + version = "0.0.0+rev=96beba9"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709"; - hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4="; + rev = "96beba9f3e4156aaae64bb86997503b1ceb1283d"; + hash = "sha256-XmSU9Om1bj/PtBxr22Sf81Mx68QINtK8Gls1fRldt6Q="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=9e59b9b"; + version = "0.0.0+rev=ee09311"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "9e59b9bbf839ba231fbcb953617d8b9b9a059e38"; - hash = "sha256-9YVXErOwUf4hcvugcgtlefyQd4p34u9AT4gUcwc3ZaU="; + rev = "ee093118211be521742b9866a8ed8ce6d87c7a94"; + hash = "sha256-tE39KP86JYYmj8WW1l3HAIiBZr/E4IyOgdsUm6d6pQ8="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -2926,23 +3002,23 @@ }; yuck = buildGrammar { language = "yuck"; - version = "0.0.0+rev=c348825"; + version = "0.0.0+rev=a513732"; src = fetchFromGitHub { owner = "Philipp-M"; repo = "tree-sitter-yuck"; - rev = "c348825d3f86dec71dee0e1223c6bd73114e3579"; - hash = "sha256-H4tsLDo9Egp1mpZGcA5Z9C9wPFNxPEBDTugUYKeYW9I="; + rev = "a513732feb813426b51d1ead8397a9c285c411be"; + hash = "sha256-XfenP9bXkskCfiq2sE8qLog0NmSecP50Ur+8HDtU4pQ="; }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-yuck"; }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=353bdf2"; + version = "0.0.0+rev=09b837d"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "353bdf25e7af9c2830e254977fd3fb57ccaa8203"; - hash = "sha256-vFDz4X0ujqM9GbrpGt3dRjvo0SR07E2qXrT/ppTegBQ="; + rev = "09b837dc8f7445fd86e1245c23b1a7804229edd4"; + hash = "sha256-t7eBWDfn0nq1nGqSyCZmoSGVGgeTcGFfPrZl62OkD1I="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c7e9a115ea468..58524a92d1a7a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -321,12 +321,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.6.7"; + codeiumVersion = "1.8.25"; codeiumHashes = { - x86_64-linux = "sha256-z1cZ6xmP25iPezeLpz4xRh7czgx1JLwsYwGAEUA6//I="; - aarch64-linux = "sha256-8cSdCiIVbqv91lUMOLV1Xld8KuIzJA5HCIDbhyyc404="; - x86_64-darwin = "sha256-pjW7tNyO0cIFdIm69H6I3HDBpFwnJIRmIN7WRi1OfLw="; - aarch64-darwin = "sha256-DgE4EVNCM9+YdTVJeVYnrDGAXOJV1VrepiVeX3ziwfg="; + 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="; }; codeium' = codeium.overrideAttrs rec { @@ -404,6 +404,13 @@ ''; }; + competitest-nvim = super.competitest-nvim.overrideAttrs { + dependencies = [ self.nui-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "competitest"; + }; + compe-tabnine = super.compe-tabnine.overrideAttrs { buildInputs = [ tabnine ]; @@ -669,7 +676,10 @@ }; hardhat-nvim = super.hardhat-nvim.overrideAttrs { - dependencies = with self; [ plenary-nvim ]; + dependencies = with self; [ overseer-nvim plenary-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "hardhat"; }; harpoon = super.harpoon.overrideAttrs { @@ -713,6 +723,13 @@ src = "${hurl.src}/contrib/vim"; }; + idris2-nvim = super.idris2-nvim.overrideAttrs { + dependencies = with self; [ nui-nvim nvim-lspconfig ]; + + doInstallCheck = true; + nvimRequireCheck = "idris2"; + }; + image-nvim = super.image-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -744,6 +761,10 @@ dependencies = with self; [ lush-nvim ]; }; + jupytext-nvim = super.jupytext-nvim.overrideAttrs { + passthru.python3Dependencies = ps: [ ps.jupytext ]; + }; + LanguageClient-neovim = let version = "0.1.161"; @@ -948,13 +969,17 @@ }; neotest = super.neotest.overrideAttrs { - dependencies = with self; [ plenary-nvim ]; + dependencies = with self; [ nvim-nio plenary-nvim ]; }; neotest-gradle = super.neotest-gradle.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; + neotest-gtest = super.neotest-gtest.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim nui-nvim ]; }; @@ -979,6 +1004,13 @@ dependencies = with self; [ nvim-dap ]; }; + nvim-dap-ui = super.nvim-dap-ui.overrideAttrs { + dependencies = with self; [ nvim-dap nvim-nio ]; + + doInstallCheck = true; + nvimRequireCheck = "dapui"; + }; + nvim-lsputils = super.nvim-lsputils.overrideAttrs { dependencies = with self; [ popfix ]; }; @@ -1006,7 +1038,7 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-VDnrJ2EJ8LDykqxYKD1VR8BkDqzzifazJzL/0UsmSCk="; + cargoHash = "sha256-UxOAIyVlJWlp5RUFVU3Ib539D5pm6Z+3edjHLerkIRU="; preCheck = '' @@ -1185,12 +1217,12 @@ sniprun = let - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-f/EifFvlHr41wP0FfkwSGVdXLyz739st/XtnsSbzNT4="; + hash = "sha256-siM0MBugee2OVaD1alr2hKn9ngoaV3Iy9No/F3wryJs="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1200,7 +1232,7 @@ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-SmhfjOnw89n/ATGvmyvd5clQSucIh7ky3v9JsSjtyfI="; + cargoHash = "sha256-Gnpv0vAU3kTtCKsV2XGlSbzYuHEqR7iDFeKj9Vhq1UQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch index 82d73809ff793..c3b1368577f3f 100644 --- a/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch @@ -21,7 +21,7 @@ index d6d4b4c..9853877 100644 else call v:lua.vim.health.ok("htop is installed") diff --git a/lua/openscad.lua b/lua/openscad.lua -index 7475f29..832c895 100644 +index 0a26d08..1264989 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua @@ -101,7 +101,7 @@ end @@ -33,12 +33,12 @@ index 7475f29..832c895 100644 end function M.help() -@@ -125,7 +125,7 @@ function M.exec_openscad() - jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. vim.fn.expand('%:p') +@@ -126,7 +126,7 @@ function M.exec_openscad() + jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename else -- TODO: What about Windows? -- jobCommand = 'openscad ' .. vim.fn.expand('%:p') -+ jobCommand = '@openscad@ ' .. vim.fn.expand('%:p') +- jobCommand = 'openscad ' .. filename ++ jobCommand = '@openscad@ ' .. filename end vim.fn.jobstart(jobCommand) diff --git a/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh index d5f0a00ebcc28..a14d3f0dd08b3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh +++ b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh @@ -23,7 +23,7 @@ vimPluginGenTags() { echo "$addonInfo" > $target/addon-info.json fi - echo "Finished executing vimPluginInstallPhase" + echo "Finished executing vimPluginGenTags" } preFixupHooks+=(vimPluginGenTags) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 99ef5148939e2..25709a73a6980 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -56,6 +56,7 @@ https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, +https://github.com/otavioschwanck/arrow.nvim/,, https://github.com/AstroNvim/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, @@ -174,6 +175,7 @@ https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, https://github.com/tamago324/cmp-zsh/,HEAD, https://github.com/saadparwaiz1/cmp_luasnip/,, +https://github.com/chrisgrieser/cmp_yanky/,HEAD, https://github.com/lalitmee/cobalt2.nvim/,, https://github.com/vn-ki/coc-clap/,, https://github.com/neoclide/coc-denite/,, @@ -198,6 +200,7 @@ https://github.com/hrsh7th/compe-conjure/,, https://github.com/GoldsteinE/compe-latex-symbols/,, https://github.com/tzachar/compe-tabnine/,, https://github.com/tamago324/compe-zsh/,, +https://github.com/xeluxee/competitest.nvim/,HEAD, https://github.com/krady21/compiler-explorer.nvim/,HEAD, https://github.com/steelsojka/completion-buffers/,, https://github.com/nvim-lua/completion-nvim/,, @@ -336,6 +339,7 @@ https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, https://github.com/ThePrimeagen/git-worktree.nvim/,, +https://github.com/wintermute-cell/gitignore.nvim/,HEAD, https://github.com/vim-scripts/gitignore.vim/,, https://github.com/ruifm/gitlinker.nvim/,, https://github.com/lewis6991/gitsigns.nvim/,, @@ -351,11 +355,14 @@ https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, +https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, +https://github.com/luisiacc/gruvbox-baby/,HEAD, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, +https://github.com/f4z3r/gruvbox-material.nvim/,HEAD, https://github.com/ellisonleao/gruvbox.nvim/,, https://github.com/nvimdev/guard-collection/,HEAD, https://github.com/nvimdev/guard.nvim/,HEAD, @@ -391,10 +398,12 @@ https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, +https://github.com/ShinKage/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim https://github.com/lewis6991/impatient.nvim/,, +https://github.com/backdround/improved-search.nvim/,HEAD, https://github.com/smjonas/inc-rename.nvim/,HEAD, https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, @@ -418,7 +427,9 @@ https://github.com/nanotech/jellybeans.vim/,, https://github.com/HiPhish/jinja.vim/,HEAD, https://github.com/vito-c/jq.vim/,, https://github.com/neoclide/jsonc.vim/,, +https://github.com/Myzel394/jsonfly.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,, +https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, https://github.com/kmonad/kmonad-vim/,, @@ -663,6 +674,7 @@ https://github.com/gpanders/nvim-moonwalk/,, https://github.com/SmiteshP/nvim-navbuddy/,, https://github.com/smiteshp/nvim-navic/,HEAD, https://github.com/AckslD/nvim-neoclip.lua/,, +https://github.com/nvim-neotest/nvim-nio/,HEAD, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/LhKipp/nvim-nu/,HEAD, @@ -734,6 +746,7 @@ https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, +https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, https://github.com/andsild/peskcolor.vim/,, https://github.com/pest-parser/pest.vim/,HEAD, @@ -759,6 +772,7 @@ https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, +https://github.com/codethread/qmk.nvim/,HEAD, https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, @@ -900,6 +914,7 @@ https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, https://github.com/KeitaNakamura/tex-conceal.vim/,, +https://github.com/let-def/texpresso.vim/,HEAD, https://github.com/johmsalas/text-case.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, @@ -922,6 +937,7 @@ https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, +https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/jgdavey/tslime.vim/,, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, @@ -1096,6 +1112,7 @@ https://github.com/junegunn/vim-github-dashboard/,, https://github.com/tikhomirov/vim-glsl/,, https://github.com/jamessan/vim-gnupg/,, https://github.com/fatih/vim-go/,, +https://github.com/habamax/vim-godot/,HEAD, https://github.com/rhysd/vim-grammarous/,, https://github.com/jparise/vim-graphql/,, https://github.com/mhinz/vim-grepper/,, @@ -1176,6 +1193,7 @@ https://github.com/Yilin-Yang/vim-markbar/,, https://github.com/preservim/vim-markdown/,, https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, +https://github.com/leafOfTree/vim-matchtag/,HEAD, https://github.com/andymass/vim-matchup/,, https://github.com/aquach/vim-mediawiki-editor/,HEAD, https://github.com/samoshkin/vim-mergetool/,, @@ -1406,6 +1424,7 @@ https://github.com/HerringtonDarkholme/yats.vim/,, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, +https://github.com/Lilja/zellij.nvim/,HEAD, https://github.com/folke/zen-mode.nvim/,, https://github.com/mcchrish/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md new file mode 100644 index 0000000000000..656ea1bdb3ae0 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -0,0 +1,37 @@ +# Visual Studio Code Extensions + +## Conventions for adding new extensions + +* Extensions are named in the **lowercase** version of the extension's unique identifier. Which is found on the marketplace extension page, and is the name under which the extension is installed by VSCode under `~/.vscode`. + Extension location should be: ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} + +* Move extension to a discrete directory whenever the extension needs extra parameters/packages (at top of the file) or other files (such as patches, update script, components). Global index file parameters/packages should be utilities shared by many extensions. Extension specific parameters/packages should not be in the global index page. + +* Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions. + +* Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order. + +* Avoid [unnecessary](https://nix.dev/guides/best-practices.html#with-scopes) use of `with`, particularly `nested with`. + +* Use `hash` instead of `sha256`. + +* On `meta` field: + - add a `changelog`. + - `description` should mention it is a Visual Studio Code extension. + - `downloadPage` is the VSCode marketplace URL. + - `homepage` is the source-code URL. + - verify `license` in upstream. + +* On commit messages: + - Naming convention for: + - Adding a new extension: + + > vscode-extensions.publisher.extension-name: init 1.2.3 + > + > Release: https://github.com/owner/project/releases/tag/1.2.3 + - Updating an extension: + + > vscode-extensions.publisher.extension-name: 1.2.3 -> 2.3.4 + > + > Release: https://github.com/owner/project/releases/tag/2.3.4 + - Multiple extensions can be added in a single PR, but each extension requires it's own commit. diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index a58a17f2a6fea..4ab87219a7cf3 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -9,7 +9,7 @@ in name = "vscode-wakatime"; publisher = "WakaTime"; version = "18.0.5"; - sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; + hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix new file mode 100644 index 0000000000000..7ab6bb7ce0c62 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix @@ -0,0 +1,27 @@ +{ + asciidoctor, + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asciidoctor-vscode"; + publisher = "asciidoctor"; + version = "2.8.9"; + sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; + }; + + postPatch = '' + substituteInPlace dist/src/text-parser.js \ + --replace "get('asciidoctor_command', 'asciidoctor')" \ + "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" + substituteInPlace dist/src/commands/exportAsPDF.js \ + --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ + "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" + ''; + + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix new file mode 100644 index 0000000000000..af1e8c3df0f35 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -0,0 +1,30 @@ +{ + lib, + jq, + moreutils, + millet, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Millet"; + publisher = "azdavis"; + version = "0.13.5"; + hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json + ''; + meta = { + description = "Standard ML support for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.smasher164 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix b/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix new file mode 100644 index 0000000000000..6edcaea67a7d9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/b4dm4n.vscode-nixpkgs-fmt/default.nix @@ -0,0 +1,27 @@ +{ + vscode-utils, + jq, + lib, + moreutils, + nixpkgs-fmt, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nixpkgs-fmt"; + publisher = "B4dM4n"; + version = "0.0.1"; + hash = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json + ''; + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix new file mode 100644 index 0000000000000..4fc5c16eb7fdf --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -0,0 +1,27 @@ +{ + clojure-lsp, + jq, + lib, + moreutils, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "calva"; + publisher = "betterthantomorrow"; + version = "2.0.374"; + hash = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json + ''; + meta = { + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 34f892df6c3b1..5717ac0c12b57 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE="; + hash = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 125dfa0041bb3..9ab9e4f165ddc 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 @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - sha256 = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; + hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; }; nativeBuildInputs = [ ocaml dune_3 ocamlPackages.cppo ]; diff --git a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 6d5e53be1cbfa..5ba82c59fee56 100644 --- a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -10,7 +10,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "context-mapper-vscode-extension"; publisher = "contextmapper"; version = "6.11.0"; - sha256 = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; + hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3c0fb90c74cdc..24d0a32ef9cbf 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1,51 +1,35 @@ -{ config -, lib -, fetchurl -, callPackage -, vscode-utils -, asciidoctor -, nodePackages -, python3Packages -, jdk -, llvmPackages -, llvmPackages_14 -, nixpkgs-fmt -, protobuf -, jq -, shellcheck -, moreutils -, racket -, clojure-lsp -, alejandra -, millet -, shfmt -, typst-lsp -, typst-preview -, autoPatchelfHook -, zlib -, stdenv +# Before adding a new extension, read ./README.md + +{ + autoPatchelfHook, + callPackage, + config, + fetchurl, + jdk, + jq, + lib, + llvmPackages, + llvmPackages_14, + moreutils, + protobuf, + python3Packages, + stdenv, + vscode-utils, + zlib, }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; - # - # Unless there is a good reason not to, we attempt to use the lowercase - # version of the extension's unique identifier. The unique identifier can be - # found on the marketplace extension page, and is the name under which the - # extension is installed by VSCode under `~/.vscode`. - # - # This means an extension should be located at - # ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name} - # - baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) - { + baseExtensions = + self: + lib.mapAttrs (_n: lib.recurseIntoAttrs) { "13xforever".language-x86-64-assembly = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-x86-64-assembly"; publisher = "13xforever"; version = "3.1.4"; - sha256 = "sha256-FJRDm1H3GLBfSKBSFgVspCjByy9m+j9OStlU+/pMfs8="; + hash = "sha256-FJRDm1H3GLBfSKBSFgVspCjByy9m+j9OStlU+/pMfs8="; }; meta = { description = "Cutting edge x86 and x86_64 assembly syntax highlighting"; @@ -61,7 +45,7 @@ let publisher = "1Password"; name = "op-vscode"; version = "1.0.4"; - sha256 = "sha256-s6acue8kgFLf5fs4A7l+IYfhibdY76cLcIwHl+54WVk="; + hash = "sha256-s6acue8kgFLf5fs4A7l+IYfhibdY76cLcIwHl+54WVk="; }; meta = { changelog = "https://github.com/1Password/op-vscode/releases"; @@ -94,7 +78,7 @@ let publisher = "4ops"; name = "terraform"; version = "0.2.5"; - sha256 = "sha256-y5LljxK8V9Fir9EoG8g9N735gISrlMg3czN21qF/KjI="; + hash = "sha256-y5LljxK8V9Fir9EoG8g9N735gISrlMg3czN21qF/KjI="; }; meta = { license = lib.licenses.mit; @@ -102,12 +86,29 @@ let }; }; + "42crunch".vscode-openapi = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "42Crunch"; + name = "vscode-openapi"; + version = "4.25.1"; + sha256 = "+hKQUJp9c0oyhePFmQEXAqtqKL3fkQ1nhopUPnhRZc4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; + description = "A Visual Studio Code extension with rich support for the OpenAPI Specification (OAS)."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=42Crunch.vscode-openapi"; + homepage = "https://github.com/42Crunch/vscode-openapi"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.benhiemer ]; + }; + }; + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-ron"; publisher = "a5huynh"; version = "0.10.0"; - sha256 = "sha256-DmyYE7RHOX/RrbIPYCq/x0l081SzmyBAd7yHSUOPkOA="; + hash = "sha256-DmyYE7RHOX/RrbIPYCq/x0l081SzmyBAd7yHSUOPkOA="; }; meta = { license = lib.licenses.mit; @@ -136,10 +137,27 @@ let name = "codesnap"; publisher = "adpyke"; version = "1.3.4"; - sha256 = "sha256-dR6qODSTK377OJpmUqG9R85l1sf9fvJJACjrYhSRWgQ="; + hash = "sha256-dR6qODSTK377OJpmUqG9R85l1sf9fvJJACjrYhSRWgQ="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + adzero.vscode-sievehighlight = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-sievehighlight"; + publisher = "adzero"; + version = "1.0.6"; + hash = "sha256-8Ompv792eI2kIH+5+KPL9jAf88xsMGQewHEQwi8BhoQ="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/adzero.vscode-sievehighlight/changelog"; + description = "A Visual Studio Code extension to enable syntax highlight support for Sieve mail filtering language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=adzero.vscode-sievehighlight"; + homepage = "https://github.com/adzero/vscode-sievehighlight"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.sebtm ]; }; }; @@ -160,7 +178,7 @@ let name = "increment-selection"; publisher = "albymor"; version = "0.2.0"; - sha256 = "sha256-iP4c0xLPiTsgD8Q8Kq9jP54HpdnBveKRY31Ro97ROJ8="; + hash = "sha256-iP4c0xLPiTsgD8Q8Kq9jP54HpdnBveKRY31Ro97ROJ8="; }; meta = { description = "Increment, decrement or reverse selection with multiple cursors"; @@ -175,7 +193,7 @@ let name = "bookmarks"; publisher = "alefragnani"; version = "13.3.1"; - sha256 = "sha256-CZSFprI8HMQvc8P9ZH+m0j9J6kqmSJM1/Ik24ghif2A="; + hash = "sha256-CZSFprI8HMQvc8P9ZH+m0j9J6kqmSJM1/Ik24ghif2A="; }; meta = { license = lib.licenses.gpl3; @@ -187,7 +205,7 @@ let name = "project-manager"; publisher = "alefragnani"; version = "12.7.0"; - sha256 = "sha256-rBMwvm7qUI6zBrXdYntQlY8WvH2fDBhEuQ1pHDl9fQg="; + hash = "sha256-rBMwvm7qUI6zBrXdYntQlY8WvH2fDBhEuQ1pHDl9fQg="; }; meta = { license = lib.licenses.mit; @@ -240,7 +258,7 @@ let name = "ng-template"; publisher = "Angular"; version = "15.2.0"; - sha256 = "sha256-ho3DtXAAafY/mpUcea2OPhy8tpX+blJMyVxbFVUsspk="; + hash = "sha256-ho3DtXAAafY/mpUcea2OPhy8tpX+blJMyVxbFVUsspk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -257,7 +275,7 @@ let name = "icons-carbon"; publisher = "antfu"; version = "0.2.6"; - sha256 = "sha256-R8eHLuebfgHaKtHPKBaaYybotluuH9WrUBpgyuIVOxc="; + hash = "sha256-R8eHLuebfgHaKtHPKBaaYybotluuH9WrUBpgyuIVOxc="; }; meta = { license = lib.licenses.mit; @@ -269,7 +287,7 @@ let publisher = "antfu"; name = "slidev"; version = "0.4.1"; - sha256 = "sha256-MNQMOT9LaEVZqelvikBTpUPTsSIA2z5qvLxw51aJw1w="; + hash = "sha256-MNQMOT9LaEVZqelvikBTpUPTsSIA2z5qvLxw51aJw1w="; }; meta = { license = lib.licenses.mit; @@ -296,7 +314,7 @@ let name = "vscode-apollo"; publisher = "apollographql"; version = "1.19.11"; - sha256 = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; + hash = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -313,12 +331,11 @@ let name = "nord-visual-studio-code"; publisher = "arcticicestudio"; version = "0.19.0"; - sha256 = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU="; + hash = "sha256-awbqFv6YuYI0tzM/QbHRTUl4B2vNUdy52F4nPmv+dRU="; }; meta = { description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; homepage = "https://github.com/arcticicestudio/nord-visual-studio-code"; license = lib.licenses.mit; maintainers = [ lib.maintainers.imgabe ]; @@ -342,41 +359,21 @@ let name = "nix-env-selector"; publisher = "arrterian"; version = "1.0.10"; - sha256 = "sha256-b3Sr0bwU2VJgl2qcdsUROZ3jnK+YUuzJMySvSD7goj8="; + hash = "sha256-b3Sr0bwU2VJgl2qcdsUROZ3jnK+YUuzJMySvSD7goj8="; }; meta = { license = lib.licenses.mit; }; }; - asciidoctor.asciidoctor-vscode = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "asciidoctor-vscode"; - publisher = "asciidoctor"; - version = "2.8.9"; - sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; - }; - - postPatch = '' - substituteInPlace dist/src/text-parser.js \ - --replace "get('asciidoctor_command', 'asciidoctor')" \ - "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" - substituteInPlace dist/src/commands/exportAsPDF.js \ - --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ - "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" - ''; - - meta = { - license = lib.licenses.mit; - }; - }; + asciidoctor.asciidoctor-vscode = callPackage ./asciidoctor.asciidoctor-vscode { }; asdine.cue = buildVscodeMarketplaceExtension { mktplcRef = { name = "cue"; publisher = "asdine"; version = "0.3.2"; - sha256 = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4="; + hash = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4="; }; meta = { description = "Cue language support for Visual Studio Code"; @@ -384,7 +381,7 @@ let homepage = "https://github.com/asdine/vscode-cue"; changelog = "https://marketplace.visualstudio.com/items/asdine.cue/changelog"; license = lib.licenses.mit; - maintainers = [lib.maintainers.matthewpi]; + maintainers = [ lib.maintainers.matthewpi ]; }; }; @@ -392,12 +389,12 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.3.3"; - sha256 = "sha256-A7+7lnCPAtSWUfHLNKbYqKuTxi2Nx05Qdh5HCkT1dnM="; + version = "2.8.3"; + hash = "sha256-A6m31eZMlOHF0yr9MjXmsFyXgH8zmq6WLRd/w85hGw0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; - description = "Astro language support for VSCode"; + description = "Astro language support for VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode"; homepage = "https://github.com/withastro/language-tools"; license = lib.licenses.mit; @@ -409,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.7.1"; - sha256 = "0ib4sjk7r370ckvaqb4yzgy7csy8pli9z2jhibhhwwcq2748ah4q"; + version = "1.8.1"; + sha256 = "0kqzry0cbvvy1pkbx5rhnk5ry7j91cbf11vz1s1jrqc7j0hq0yx8"; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -427,7 +424,7 @@ let name = "brainfuck-syntax"; publisher = "attilabuti"; version = "0.0.1"; - sha256 = "sha256-ZcZlHoa2aoCeruMWbUUgfFHsPqyWmd2xFY6AKxJysYE="; + hash = "sha256-ZcZlHoa2aoCeruMWbUUgfFHsPqyWmd2xFY6AKxJysYE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/attilabuti.brainfuck-syntax/changelog"; @@ -439,49 +436,16 @@ let }; }; - azdavis.millet = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "Millet"; - publisher = "azdavis"; - version = "0.13.5"; - sha256 = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json - ''; - meta = { - description = "Standard ML support for VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=azdavis.millet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.smasher164 ]; - }; - }; + azdavis.millet = callPackage ./azdavis.millet { }; - b4dm4n.vscode-nixpkgs-fmt = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "nixpkgs-fmt"; - publisher = "B4dM4n"; - version = "0.0.1"; - sha256 = "sha256-vz2kU36B1xkLci2QwLpl/SBEhfSWltIDJ1r7SorHcr8="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."nixpkgs-fmt.path".default = "${nixpkgs-fmt}/bin/nixpkgs-fmt"' package.json | sponge package.json - ''; - meta = { - license = lib.licenses.mit; - }; - }; + b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { }; baccata.scaladex-search = buildVscodeMarketplaceExtension { mktplcRef = { name = "scaladex-search"; publisher = "baccata"; version = "0.3.3"; - sha256 = "sha256-+793uA+cSBHV6t4wAM4j4GeWggLJTl2GENkn8RFIwr0="; + hash = "sha256-+793uA+cSBHV6t4wAM4j4GeWggLJTl2GENkn8RFIwr0="; }; meta = { license = lib.licenses.asl20; @@ -493,7 +457,7 @@ let name = "ocaml-formatter"; publisher = "badochov"; version = "2.0.5"; - sha256 = "sha256-D04EJButnam/l4aAv1yNbHlTKMb3x1yrS47+9XjpCLI="; + hash = "sha256-D04EJButnam/l4aAv1yNbHlTKMb3x1yrS47+9XjpCLI="; }; meta = { description = "VSCode Extension Formatter for OCaml language"; @@ -509,7 +473,7 @@ let publisher = "ban"; name = "spellright"; version = "3.0.112"; - sha256 = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA="; + hash = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA="; }; meta = { description = "A Visual Studio Code extension for Spellchecker"; @@ -525,7 +489,7 @@ let publisher = "batisteo"; name = "vscode-django"; version = "1.10.0"; - sha256 = "sha256-vTaE3KhG5i2jGc5o33u76RUUFYaW4s4muHvph48HeQ4="; + hash = "sha256-vTaE3KhG5i2jGc5o33u76RUUFYaW4s4muHvph48HeQ4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/batisteo.vscode-django/changelog"; @@ -569,36 +533,21 @@ let name = "vscode-unison"; publisher = "benfradet"; version = "0.4.0"; - sha256 = "sha256-IDM9v+LWckf20xnRTj+ThAFSzVxxDVQaJkwO37UIIhs="; + hash = "sha256-IDM9v+LWckf20xnRTj+ThAFSzVxxDVQaJkwO37UIIhs="; }; meta = { license = lib.licenses.asl20; }; }; - betterthantomorrow.calva = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "calva"; - publisher = "betterthantomorrow"; - version = "2.0.374"; - sha256 = "sha256-VwdHOkduSSIrcOvrcVf7K8DSp3N1u9fvbaCVDCxp+bk="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration[0].properties."calva.clojureLspPath".default = "${clojure-lsp}/bin/clojure-lsp"' package.json | sponge package.json - ''; - meta = { - license = lib.licenses.mit; - }; - }; + betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; - bierner.docs-view = buildVscodeMarketplaceExtension { + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; publisher = "bierner"; version = "0.0.11"; - sha256 = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw="; + hash = "sha256-3njIL2SWGFp87cvQEemABJk2nXzwI1Il/WG3E0ZYZxw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bierner.docs-view/changelog"; @@ -614,7 +563,7 @@ let name = "emojisense"; publisher = "bierner"; version = "0.10.0"; - sha256 = "sha256-PD8edYuJu6QHPYIM08kV85LuKh0H0/MIgFmMxSJFK5M="; + hash = "sha256-PD8edYuJu6QHPYIM08kV85LuKh0H0/MIgFmMxSJFK5M="; }; meta = { license = lib.licenses.mit; @@ -626,7 +575,7 @@ let name = "markdown-checkbox"; publisher = "bierner"; version = "0.4.0"; - sha256 = "sha256-AoPcdN/67WOzarnF+GIx/nans38Jan8Z5D0StBWIbkk="; + hash = "sha256-AoPcdN/67WOzarnF+GIx/nans38Jan8Z5D0StBWIbkk="; }; meta = { license = lib.licenses.mit; @@ -638,7 +587,7 @@ let name = "markdown-emoji"; publisher = "bierner"; version = "0.3.0"; - sha256 = "sha256-rw8/HeDA8kQuiPVDpeOGw1Mscd6vn4utw1Qznsd8lVI="; + hash = "sha256-rw8/HeDA8kQuiPVDpeOGw1Mscd6vn4utw1Qznsd8lVI="; }; meta = { license = lib.licenses.mit; @@ -650,7 +599,7 @@ let name = "markdown-mermaid"; publisher = "bierner"; version = "1.17.7"; - sha256 = "sha256-WKe7XxBeYyzmjf/gnPH+5xNOHNhMPAKjtLorYyvT76U="; + hash = "sha256-WKe7XxBeYyzmjf/gnPH+5xNOHNhMPAKjtLorYyvT76U="; }; meta = { license = lib.licenses.mit; @@ -662,7 +611,7 @@ let name = "vscode-fish"; publisher = "bmalehorn"; version = "1.0.35"; - sha256 = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; + hash = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; }; meta.license = lib.licenses.mit; }; @@ -671,8 +620,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.10.2"; - sha256 = "sha256-he/aPcsxfqYWI/RJ51d5V0reaTPTATci34xPm93qxGs="; + version = "1.10.4"; + hash = "sha256-bD7AL4x0yL5S+MzQXMBrSZs1pVclfvsTfUbImP1oQok="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -687,7 +636,7 @@ let name = "file-browser"; publisher = "bodil"; version = "0.2.11"; - sha256 = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; + hash = "sha256-yPVhhsAUZxnlhj58fXkk+yhxop2q7YJ6X4W9dXGKJfo="; }; meta = { license = lib.licenses.mit; @@ -699,7 +648,7 @@ let name = "vscode-tailwindcss"; publisher = "bradlc"; version = "0.11.30"; - sha256 = "sha256-1CxyvQu7WQJw87sTcpnILztt1WeSpWOgij0dEIXebPU="; + hash = "sha256-1CxyvQu7WQJw87sTcpnILztt1WeSpWOgij0dEIXebPU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -715,7 +664,7 @@ let name = "solarized-palenight"; publisher = "BrandonKirbyson"; version = "1.0.1"; - sha256 = "sha256-vVbaHSaBX6QzpnYMQlpPsJU1TQYJEBe8jq95muzwN0o="; + hash = "sha256-vVbaHSaBX6QzpnYMQlpPsJU1TQYJEBe8jq95muzwN0o="; }; meta = { description = " A solarized-palenight theme for vscode"; @@ -743,7 +692,7 @@ let name = "better-toml"; publisher = "bungcip"; version = "0.3.2"; - sha256 = "sha256-g+LfgjAnSuSj/nSmlPdB0t29kqTmegZB5B1cYzP8kCI="; + hash = "sha256-g+LfgjAnSuSj/nSmlPdB0t29kqTmegZB5B1cYzP8kCI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bungcip.better-toml/changelog"; @@ -760,7 +709,7 @@ let name = "cyberpunk-2020"; publisher = "carrie999"; version = "0.1.4"; - sha256 = "sha256-tVbd+j9+90Z07+jGAiT0gylZN9YWHdJmq2sh1wf2oGE="; + hash = "sha256-tVbd+j9+90Z07+jGAiT0gylZN9YWHdJmq2sh1wf2oGE="; }; meta = { description = "A cyberpunk-inspired colour theme to satisfy your neon dreams"; @@ -777,7 +726,7 @@ let name = "catppuccin-vsc"; publisher = "catppuccin"; version = "2.6.1"; - sha256 = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY="; + hash = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY="; }; meta = { description = "Soothing pastel theme for VSCode"; @@ -790,10 +739,11 @@ let mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "0.12.0"; - sha256 = "sha256-i47tY6DSVtV8Yf6AgZ6njqfhaUFGEpgbRcBF70l2Xe0="; + version = "1.10.0"; + hash = "sha256-6klrnMHAIr+loz7jf7l5EZPLBhgkJODFHL9fzl1MqFI="; }; 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"; @@ -803,30 +753,33 @@ let }; charliermarsh.ruff = buildVscodeMarketplaceExtension { - mktplcRef = let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; + 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}"); + 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"; @@ -837,6 +790,22 @@ let }; }; + cameron.vscode-pytest = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pytest"; + publisher = "Cameron"; + version = "0.1.1"; + hash = "sha256-YU37a0Q+IXusXgwf9doxXLlYiyzkizbPjjdCZFxeDaA="; + }; + meta = { + changelog = "https://github.com/cameronmaske/pytest-vscode/blob/master/CHANGELOG.md"; + description = "A Visual Studio Code extension that adds IntelliSense support for pytest fixtures"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Cameron.vscode-pytest"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.rhoriguchi ]; + }; + }; + christian-kohler.npm-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "npm-intellisense"; @@ -905,8 +874,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "0.1.18"; - sha256 = "soNGZuyvG5+haWRcwYmYB+0OcyDAm4UQ419UnEd8waA="; + version = "0.1.36"; + hash = "sha256-N1X8wB2n6JYoFHCP5iHBXHnEaRa9S1zooQZsR5mUeh8="; }; meta = { description = "An extension for Visual Studio Code to open any Coder workspace in VS Code with a single click."; @@ -922,7 +891,7 @@ let name = "gitignore"; publisher = "codezombiech"; version = "0.9.0"; - sha256 = "sha256-IHoF+c8Rsi6WnXoCX7x3wKyuMwLh14nbL9sNVJHogHM="; + hash = "sha256-IHoF+c8Rsi6WnXoCX7x3wKyuMwLh14nbL9sNVJHogHM="; }; meta = { license = lib.licenses.mit; @@ -934,7 +903,7 @@ let name = "code-translate"; publisher = "w88975"; version = "1.0.20"; - sha256 = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw="; + hash = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw="; }; meta = { description = "A Visual Studio Code extension to provide purely hover translation"; @@ -958,7 +927,7 @@ let name = "llvm-syntax-highlighting"; publisher = "colejcummins"; version = "0.0.3"; - sha256 = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; + hash = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; }; meta = { description = "Lightweight syntax highlighting for LLVM IR"; @@ -969,7 +938,9 @@ let }; }; - contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { }; + contextmapper.context-mapper-vscode-extension = + callPackage ./contextmapper.context-mapper-vscode-extension + { }; continue.continue = buildVscodeMarketplaceExtension { mktplcRef = @@ -977,33 +948,30 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - sha256 = "05kh6sf3jv3510q33chf8s5n1kfp9wcm7650va7mcrdkfr9g8ysq"; + sha256 = "1y5g8ay9sfz7r21fhwb2wr28yng7w3f2l265ljnfkz8yv8qzqpgk"; }; "x86_64-darwin" = { arch = "darwin-x64"; - sha256 = "0242h9kq47qvs1xynr5x8dzxkc5pwgb6km0iqpyy9kydg8ng1vp3"; + sha256 = "14v9p5k9c9s9hfb1ymmkp66kmm9pvnvvljzrrs9wmajss5mlglf5"; }; "aarch64-linux" = { arch = "linux-arm64"; - sha256 = "1qm3f2lh8mi3hnyp2bmx7j2lir6fmbbxkzh6b8zf579khhbapnaz"; + sha256 = "1mngfy42crp8xs14s06rkyzv16ci12bq8y39miyy7wa3a343b0ii"; }; "aarch64-darwin" = { arch = "darwin-arm64"; - sha256 = "18w22z1c5qgkpw2zlwmi9gs9dx1pcm51f0r8my7ynnvgl6mp12sg"; + sha256 = "1gd1kr91s52kc8ldzy78cbn6gix1b8cvd6jh4sfrhq7k8yyn7g1l"; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.12"; - } // sources.${stdenv.system}; - nativeBuildInputs = [ - autoPatchelfHook - ]; - buildInputs = [ - stdenv.cc.cc.lib - ]; + version = "0.8.22"; + } + // sources.${stdenv.system}; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; postInstall = '' cd "$out/$installPrefix" substituteInPlace "out/extension.js" \ @@ -1015,7 +983,12 @@ let homepage = "https://github.com/continuedev/continue"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.raroh73 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; }; }; @@ -1037,7 +1010,7 @@ let name = "dbclient-jdbc"; publisher = "cweijan"; version = "1.3.4"; - sha256 = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k="; + hash = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k="; }; meta = { description = "JDBC Adapter For Database Client"; @@ -1053,7 +1026,7 @@ let name = "vscode-database-client2"; publisher = "cweijan"; version = "6.3.0"; - sha256 = "sha256-BFTY3NZQd6XTE3UNO1bWo/LiM4sHujFGOSufDLD4mzM="; + hash = "sha256-BFTY3NZQd6XTE3UNO1bWo/LiM4sHujFGOSufDLD4mzM="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1067,7 +1040,7 @@ let publisher = "daohong-emilio"; name = "yash"; version = "0.2.9"; - sha256 = "sha256-5JX6Z7xVPoqGjD1/ySc9ObD14O1sWDpvBj9VbtGO1Cg="; + hash = "sha256-5JX6Z7xVPoqGjD1/ySc9ObD14O1sWDpvBj9VbtGO1Cg="; }; meta = { license = lib.licenses.mit; @@ -1080,7 +1053,7 @@ let name = "dart-code"; publisher = "dart-code"; version = "3.61.20230324"; - sha256 = "sha256-VVQ32heyzLjM5HdeNAK5PwqB1NsSQ9iQJBwJiJXlu+g="; + hash = "sha256-VVQ32heyzLjM5HdeNAK5PwqB1NsSQ9iQJBwJiJXlu+g="; }; meta.license = lib.licenses.mit; @@ -1091,7 +1064,7 @@ let name = "flutter"; publisher = "dart-code"; version = "3.61.20230301"; - sha256 = "sha256-t4AfFgxVCl15YOz7NTULvNUcyuiQilEP6jPK4zMAAmc="; + hash = "sha256-t4AfFgxVCl15YOz7NTULvNUcyuiQilEP6jPK4zMAAmc="; }; meta.license = lib.licenses.mit; @@ -1101,8 +1074,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.54.0"; - sha256 = "sha256-BrPFFRspJIz1U08hPbLziCmRUeZv2NhRrTCx6qvhOJw="; + version = "0.55.0"; + hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1119,7 +1092,7 @@ let name = "languagetool-linter"; publisher = "davidlday"; version = "0.19.0"; - sha256 = "sha256-crq6CTXpzwHJL8FPIBneAGjDgUUNdpBt6rIaMCr1F1U="; + hash = "sha256-crq6CTXpzwHJL8FPIBneAGjDgUUNdpBt6rIaMCr1F1U="; }; meta = { description = "LanguageTool integration for VS Code"; @@ -1135,7 +1108,7 @@ let name = "vscode-eslint"; publisher = "dbaeumer"; version = "2.4.4"; - sha256 = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; + hash = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; @@ -1152,7 +1125,7 @@ let name = "vscode-deno"; publisher = "denoland"; version = "3.17.0"; - sha256 = "sha256-ETwpUrYbPXHSkEBq2oM1aCBwt9ItLcXMYc3YWjHLiJE="; + hash = "sha256-ETwpUrYbPXHSkEBq2oM1aCBwt9ItLcXMYc3YWjHLiJE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -1169,7 +1142,7 @@ let name = "composer-php-vscode"; publisher = "devsense"; version = "1.41.14332"; - sha256 = "sha256-qRgncn6u40Igd40OZShRHXqdgjFqRLNb0hPirwc+DoU="; + hash = "sha256-qRgncn6u40Igd40OZShRHXqdgjFqRLNb0hPirwc+DoU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog"; @@ -1182,34 +1155,35 @@ let }; devsense.phptools-vscode = buildVscodeMarketplaceExtension { - mktplcRef = let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-8i5nRlzd+LnpEh9trWECxfiC1W4S0ekBab5vo18OlsA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "14crw56277rdwhigabb3nsndkfcs3yzzf7gw85jvryxviq32chgy"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1j1xlvbg3nrfmdd9zm6kywwicdwdkrq0si86lcndaii8m7sj5pfp"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0nlks6iqxkx1xlicsa8lrb1319rgznlxkv2gg7wkwgzph97ik8bi"; + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-8i5nRlzd+LnpEh9trWECxfiC1W4S0ekBab5vo18OlsA="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "14crw56277rdwhigabb3nsndkfcs3yzzf7gw85jvryxviq32chgy"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1j1xlvbg3nrfmdd9zm6kywwicdwdkrq0si86lcndaii8m7sj5pfp"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "0nlks6iqxkx1xlicsa8lrb1319rgznlxkv2gg7wkwgzph97ik8bi"; + }; }; - }; - in { - name = "phptools-vscode"; - publisher = "devsense"; - version = "1.41.14332"; - } // sources.${stdenv.system}; + in + { + name = "phptools-vscode"; + publisher = "devsense"; + version = "1.41.14332"; + } + // sources.${stdenv.system}; - nativeBuildInputs = [ - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ zlib @@ -1227,7 +1201,12 @@ let homepage = "https://github.com/DEVSENSE/phptools-docs"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.drupol ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; }; }; @@ -1236,7 +1215,7 @@ let name = "profiler-php-vscode"; publisher = "devsense"; version = "1.41.14332"; - sha256 = "sha256-u2lNqG6FUhWnnNGtv+sjTbP/hbu4Da/8xjLzmPZkZOA="; + hash = "sha256-u2lNqG6FUhWnnNGtv+sjTbP/hbu4Da/8xjLzmPZkZOA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; @@ -1255,7 +1234,9 @@ let version = "0.0.4"; sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; }; - meta = { license = lib.licenses.mit; }; + meta = { + license = lib.licenses.mit; + }; }; dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { @@ -1265,7 +1246,9 @@ let version = "0.0.4"; sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; }; - meta = { license = lib.licenses.mit; }; + meta = { + license = lib.licenses.mit; + }; }; dhedgecock.radical-vscode = buildVscodeMarketplaceExtension { @@ -1273,7 +1256,7 @@ let name = "radical-vscode"; publisher = "dhedgecock"; version = "3.3.1"; - sha256 = "sha256-VvFQovuE+I0lqXU9fHrmk7nWMpuuWafqm9Acwb0+QYg="; + hash = "sha256-VvFQovuE+I0lqXU9fHrmk7nWMpuuWafqm9Acwb0+QYg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dhedgecock.radical-vscode/changelog"; @@ -1290,9 +1273,11 @@ let publisher = "disneystreaming"; name = "smithy"; version = "0.0.8"; - sha256 = "sha256-BQPiSxiPPjdNPtIJI8L+558DVKxngPAI9sscpcJSJUI="; + hash = "sha256-BQPiSxiPPjdNPtIJI8L+558DVKxngPAI9sscpcJSJUI="; + }; + meta = { + license = lib.licenses.asl20; }; - meta = { license = lib.licenses.asl20; }; }; divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { @@ -1300,7 +1285,7 @@ let name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; version = "5.10.0"; - sha256 = "sha256-KALTldVaptKt8k2Y6PMqhJEMrayB4yn86x2CxHn6Ba0="; + hash = "sha256-KALTldVaptKt8k2Y6PMqhJEMrayB4yn86x2CxHn6Ba0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; @@ -1317,7 +1302,7 @@ let name = "githistory"; publisher = "donjayamanne"; version = "0.6.20"; - sha256 = "sha256-nEdYS9/cMS4dcbFje23a47QBZr9eDK3dvtkFWqA+OHU="; + hash = "sha256-nEdYS9/cMS4dcbFje23a47QBZr9eDK3dvtkFWqA+OHU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog"; @@ -1334,7 +1319,7 @@ let name = "dotenv-vscode"; publisher = "dotenv"; version = "0.28.0"; - sha256 = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8="; + hash = "sha256-KiQgFvbfLsA/ADROoG6y6c/i0XHuTNH2AN+6mWEm0P8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dotenv.dotenv-vscode/changelog"; @@ -1364,7 +1349,7 @@ let name = "theme-dracula"; publisher = "dracula-theme"; version = "2.24.3"; - sha256 = "sha256-3B18lEu8rXVXySdF3+xsPnAyruIuEQJDhlNw82Xm6b0="; + hash = "sha256-3B18lEu8rXVXySdF3+xsPnAyruIuEQJDhlNw82Xm6b0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dracula-theme.theme-dracula/changelog"; @@ -1383,12 +1368,12 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "14.1.1"; - sha256 = "sha256-eSN48IudpHYzT4u+S4b2I2pyEPyOwBCSL49awT/mzEE="; + version = "14.9.0"; + hash = "sha256-Z6KeIUw1SLZ4tUgs7sU9IJO/6diozPxQuTbXr6DayHA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; - description = "GitLens supercharges the Git capabilities built into Visual Studio Code."; + description = "A Visual Studio Code extension that improves its built-in Git capabilities"; longDescription = '' Supercharge the Git capabilities built into Visual Studio Code — Visualize code authorship at a glance via Git blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via @@ -1457,7 +1442,7 @@ let name = "vscode-command-runner"; publisher = "edonet"; version = "0.0.123"; - sha256 = "sha256-Fq0KgW5N6urj8hMUs6Spidy47jwIkpkmBUlpXMVnq7s="; + hash = "sha256-Fq0KgW5N6urj8hMUs6Spidy47jwIkpkmBUlpXMVnq7s="; }; meta = { license = lib.licenses.mit; @@ -1469,7 +1454,7 @@ let name = "vscode-npm-script"; publisher = "eg2"; version = "0.3.29"; - sha256 = "sha256-k6DtmhYBj7mg8SUU3pg+ezRzWvhiECqYQVj9LDhhV4I="; + hash = "sha256-k6DtmhYBj7mg8SUU3pg+ezRzWvhiECqYQVj9LDhhV4I="; }; meta = { license = lib.licenses.mit; @@ -1481,7 +1466,7 @@ let name = "elixir-ls"; publisher = "JakeBecker"; version = "0.20.0"; - sha256 = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E="; + hash = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1498,7 +1483,7 @@ let name = "elm-ls-vscode"; publisher = "Elmtooling"; version = "2.6.0"; - sha256 = "sha256-iNFc7YJFl3d4/BJE9TPJfL0iqEkUtyEyVt4v1J2bXts="; + hash = "sha256-iNFc7YJFl3d4/BJE9TPJfL0iqEkUtyEyVt4v1J2bXts="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; @@ -1515,7 +1500,7 @@ let name = "vscode-great-icons"; publisher = "emmanuelbeziat"; version = "2.1.92"; - sha256 = "sha256-cywFx33oTQZxFUxL9qCpV12pV2tP0ujR4osCdtSOOTc="; + hash = "sha256-cywFx33oTQZxFUxL9qCpV12pV2tP0ujR4osCdtSOOTc="; }; meta = { license = lib.licenses.mit; @@ -1527,7 +1512,7 @@ let name = "atomize-atom-one-dark-theme"; publisher = "emroussel"; version = "2.0.2"; - sha256 = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA="; + hash = "sha256-GwuFtBVj0Z2rHryst/7cegskvZIMPsrAH12+K942+JA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/emroussel.atomize-atom-one-dark-theme/changelog"; @@ -1543,7 +1528,7 @@ let name = "tokyo-night"; publisher = "enkia"; version = "1.0.0"; - sha256 = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c="; + hash = "sha256-/fM+aUDUzVJ6P38i+GrxhLv2eLJNa8OFkKsM4yPBy4c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/enkia.tokyo-night/changelog"; @@ -1561,7 +1546,7 @@ let name = "vsc-material-theme-icons"; publisher = "Equinusocio"; version = "3.5.0"; - sha256 = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM="; + hash = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM="; }; meta = { description = "Material Theme Icons, the most epic icons theme for Visual Studio Code and Material Theme."; @@ -1576,8 +1561,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "10.1.0"; - sha256 = "sha256-SQuf15Jq84MKBVqK6UviK04uo7gQw9yuw/WEBEXcQAc="; + version = "10.4.0"; + hash = "sha256-8+90cZpqyH+wBgPFaX5GaU6E02yBWUoB+T9C2z2Ix8c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -1594,38 +1579,18 @@ let name = "restore-terminals"; publisher = "ethansk"; version = "1.1.8"; - sha256 = "sha256-pZK/QNomQoFRsL6LRIKvWQj8/SYo2ZdVU47Gsmb9MXo="; + hash = "sha256-pZK/QNomQoFRsL6LRIKvWQj8/SYo2ZdVU47Gsmb9MXo="; }; }; - eugleo.magic-racket = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "magic-racket"; - publisher = "evzen-wybitul"; - version = "0.6.4"; - sha256 = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json - jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json - ''; - meta = { - changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; - description = "The best coding experience for Racket in VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; - homepage = "https://github.com/Eugleo/magic-racket"; - license = lib.licenses.agpl3Only; - }; - }; + eugleo.magic-racket = callPackage ./eugleo.magic-racket { }; ExiaHuang.dictionary = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ExiaHuang"; name = "dictionary"; version = "0.0.2"; - sha256 = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A="; + hash = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A="; }; meta = { description = "A Visual Studio Code extension of using chinese-english dictonary in right-click menu"; @@ -1658,7 +1623,7 @@ let name = "vscode-firefox-debug"; publisher = "firefox-devtools"; version = "2.9.10"; - sha256 = "sha256-xuvlE8L/qjOn8Qhkv9sutn/xRbwC9V/IIfEr4Ixm1vA="; + hash = "sha256-xuvlE8L/qjOn8Qhkv9sutn/xRbwC9V/IIfEr4Ixm1vA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; @@ -1675,7 +1640,7 @@ let name = "vscode-jest-runner"; publisher = "firsttris"; version = "0.4.72"; - sha256 = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM="; + hash = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -1691,7 +1656,7 @@ let name = "foam-vscode"; publisher = "foam"; version = "0.21.1"; - sha256 = "sha256-Ff1g+Qu4nUGR3g5PqOwP7W6S+3jje9gz1HK8J0+B65w="; + hash = "sha256-Ff1g+Qu4nUGR3g5PqOwP7W6S+3jje9gz1HK8J0+B65w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -1708,7 +1673,7 @@ let name = "auto-close-tag"; publisher = "formulahendry"; version = "0.5.14"; - sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; + hash = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; }; meta = { license = lib.licenses.mit; @@ -1720,7 +1685,7 @@ let name = "auto-rename-tag"; publisher = "formulahendry"; version = "0.1.10"; - sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; + hash = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; }; meta = { license = lib.licenses.mit; @@ -1732,35 +1697,14 @@ let name = "code-runner"; publisher = "formulahendry"; version = "0.12.0"; - sha256 = "sha256-Q2gcuclG7NLR81HjKj/0RF0jM5Eqe2vZMbpoabp/osg="; + hash = "sha256-Q2gcuclG7NLR81HjKj/0RF0jM5Eqe2vZMbpoabp/osg="; }; meta = { license = lib.licenses.mit; }; }; - foxundermoon.shell-format = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "shell-format"; - publisher = "foxundermoon"; - version = "7.1.0"; - sha256 = "09z72mdr5bfdcb67xyzlv7lb9vyjlc3k9ackj4jgixfk40c68cnj"; - }; - - nativeBuildInputs = [ jq moreutils ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json - ''; - - meta = { - downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; - homepage = "https://github.com/foxundermoon/vs-shell-format"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.dbirks ]; - }; - }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { meta = { @@ -1784,7 +1728,7 @@ let publisher = "funkyremi"; name = "vscode-google-translate"; version = "1.4.13"; - sha256 = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; + hash = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4="; }; meta = { description = "A Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket"; @@ -1834,7 +1778,7 @@ let publisher = "github"; name = "codespaces"; version = "1.16.9"; - sha256 = "sha256-Zj1dHz8uBHnRpjnD9tUr8OJILRq9Ty91ePiNq6/Vi7c="; + hash = "sha256-Zj1dHz8uBHnRpjnD9tUr8OJILRq9Ty91ePiNq6/Vi7c="; }; meta = { @@ -1850,7 +1794,7 @@ let publisher = "github"; name = "copilot"; version = "1.172.758"; - sha256 = "sha256-sK3IiA4mQ6Hse+UpZ81Zb5iBSREzTrs7ypsfGbJiXm4="; + hash = "sha256-sK3IiA4mQ6Hse+UpZ81Zb5iBSREzTrs7ypsfGbJiXm4="; }; meta = { @@ -1867,7 +1811,7 @@ let publisher = "github"; name = "copilot-chat"; version = "0.13.2024022301"; # compatible with vscode >= 1.87 - sha256 = "sha256-WdojLEdrg6iqTH/cNPEWb6VEfk+gIHh2M5GHrAURjy8="; + hash = "sha256-WdojLEdrg6iqTH/cNPEWb6VEfk+gIHh2M5GHrAURjy8="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -1883,12 +1827,11 @@ let name = "github-vscode-theme"; publisher = "github"; version = "6.3.4"; - sha256 = "sha256-JbI0B7jxt/2pNg/hMjAE5pBBa3LbUdi+GF0iEZUDUDM="; + hash = "sha256-JbI0B7jxt/2pNg/hMjAE5pBBa3LbUdi+GF0iEZUDUDM="; }; meta = { description = "GitHub theme for VS Code"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; homepage = "https://github.com/primer/github-vscode-theme"; license = lib.licenses.mit; maintainers = [ lib.maintainers.hugolgst ]; @@ -1900,7 +1843,7 @@ let name = "vscode-github-actions"; publisher = "github"; version = "0.26.2"; - sha256 = "sha256-sEc6Fbn4XpK8vNK32R4fjnx/R+1xYOwcuhKlo7sPd5o="; + hash = "sha256-sEc6Fbn4XpK8vNK32R4fjnx/R+1xYOwcuhKlo7sPd5o="; }; meta = { description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; @@ -1921,9 +1864,11 @@ let # using preview versions, because they can require insider versions # of VS Code version = "0.78.1"; - sha256 = "sha256-T9oW6o4ItZfR8E1qrcH3nhMvVB6ihi4kpiDz7YGHOcI="; + hash = "sha256-T9oW6o4ItZfR8E1qrcH3nhMvVB6ihi4kpiDz7YGHOcI="; + }; + meta = { + license = lib.licenses.mit; }; - meta = { license = lib.licenses.mit; }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { @@ -1931,7 +1876,7 @@ let name = "gitlab-workflow"; publisher = "gitlab"; version = "3.60.0"; - sha256 = "sha256-rH0+6sQfBfI8SrKY9GGtTOONdzKus6Z62E8Qv5xY7Fw="; + hash = "sha256-rH0+6sQfBfI8SrKY9GGtTOONdzKus6Z62E8Qv5xY7Fw="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -1947,7 +1892,7 @@ let name = "gleam"; publisher = "gleam"; version = "2.3.0"; - sha256 = "sha256-dhRS8fLKY0plRwnrAUWT4g/LfH6IpODTNhT79g4Nm+0="; + hash = "sha256-dhRS8fLKY0plRwnrAUWT4g/LfH6IpODTNhT79g4Nm+0="; }; meta = { description = "Support for the Gleam programming language"; @@ -1963,7 +1908,7 @@ let name = "Go"; publisher = "golang"; version = "0.40.0"; - sha256 = "sha256-otAq6ul2l64zpRJdekCb7XZiE2vgpLUfM4NUdRPZX8w="; + hash = "sha256-otAq6ul2l64zpRJdekCb7XZiE2vgpLUfM4NUdRPZX8w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -1979,7 +1924,7 @@ let name = "gc-excelviewer"; publisher = "grapecity"; version = "4.2.56"; - sha256 = "sha256-lrKkxaqPDouWzDP1uUE4Rgt9mI61jUOi/xZ85A0mnrk="; + hash = "sha256-lrKkxaqPDouWzDP1uUE4Rgt9mI61jUOi/xZ85A0mnrk="; }; meta = { description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; @@ -1995,7 +1940,7 @@ let name = "vscode-graphql"; publisher = "GraphQL"; version = "0.8.7"; - sha256 = "sha256-u3VcpgLKiEeUr1I6w71wleKyaO6v0gmHiw5Ama6fv88="; + hash = "sha256-u3VcpgLKiEeUr1I6w71wleKyaO6v0gmHiw5Ama6fv88="; }; meta = { description = "GraphQL extension for VSCode built with the aim to tightly integrate the GraphQL Ecosystem with VSCode for an awesome developer experience."; @@ -2011,7 +1956,7 @@ let name = "vscode-graphql-syntax"; publisher = "GraphQL"; version = "1.1.0"; - sha256 = "sha256-qazU0UyZ9de6Huj2AYZqqBo4jVW/ZQmFJhV7XXAblxo="; + hash = "sha256-qazU0UyZ9de6Huj2AYZqqBo4jVW/ZQmFJhV7XXAblxo="; }; meta = { description = "Adds full GraphQL syntax highlighting and language support such as bracket matching."; @@ -2027,7 +1972,7 @@ let name = "vhs"; publisher = "griimick"; version = "0.0.4"; - sha256 = "sha256-zAy8o5d2pK5ra/dbwoLgPAQAYfRQtUYQjisWYgIhsXA="; + hash = "sha256-zAy8o5d2pK5ra/dbwoLgPAQAYfRQtUYQjisWYgIhsXA="; }; meta = { description = "Visual Studio Code extension providing syntax support for VHS .tape files"; @@ -2043,7 +1988,7 @@ let name = "todo-tree"; publisher = "Gruntfuggly"; version = "0.0.226"; - sha256 = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; + hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; }; meta = { license = lib.licenses.mit; @@ -2055,7 +2000,7 @@ let name = "cppsnippets"; publisher = "hars"; version = "0.0.15"; - sha256 = "sha256-KXdEKcxPclbD22aKGAKSmdpVBZP2IpQRaKfc2LDsL0U="; + hash = "sha256-KXdEKcxPclbD22aKGAKSmdpVBZP2IpQRaKfc2LDsL0U="; }; meta = { description = "Code snippets for C/C++"; @@ -2071,7 +2016,7 @@ let name = "HCL"; publisher = "HashiCorp"; version = "0.3.2"; - sha256 = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo="; + hash = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo="; }; meta = { description = "HashiCorp HCL syntax"; @@ -2089,19 +2034,35 @@ let name = "haskell"; publisher = "haskell"; version = "2.2.2"; - sha256 = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q="; + hash = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q="; }; meta = { license = lib.licenses.mit; }; }; + hbenl.vscode-test-explorer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-test-explorer"; + publisher = "hbenl"; + version = "2.21.1"; + hash = "sha256-fHyePd8fYPt7zPHBGiVmd8fRx+IM3/cSBCyiI/C0VAg="; + }; + meta = { + changelog = "https://github.com/hbenl/vscode-test-explorer/blob/master/CHANGELOG.md"; + description = "A Visual Studio Code extension that runs your tests in the sidebar"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=hbenl.vscode-test-explorer"; + homepage = "https://github.com/hbenl/vscode-test-explorer"; + license = lib.licenses.mit; + }; + }; + hediet.vscode-drawio = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-drawio"; publisher = "hediet"; version = "1.6.6"; - sha256 = "sha256-SPcSnS7LnRL5gdiJIVsFaN7eccrUHSj9uQYIQZllm0M="; + hash = "sha256-SPcSnS7LnRL5gdiJIVsFaN7eccrUHSj9uQYIQZllm0M="; }; meta = { description = "This unofficial extension integrates Draw.io into VS Code."; @@ -2129,7 +2090,7 @@ let publisher = "humao"; name = "rest-client"; version = "0.25.1"; - sha256 = "sha256-DSzZ9wGB0IVK8gYOzLLbT03WX3xSmR/IUVZkDzcczKc="; + hash = "sha256-DSzZ9wGB0IVK8gYOzLLbT03WX3xSmR/IUVZkDzcczKc="; }; meta = { license = lib.licenses.mit; @@ -2153,7 +2114,7 @@ let name = "workspacesort"; publisher = "iciclesoft"; version = "1.6.2"; - sha256 = "sha256-ZsjBgoTr4LGQW0kn+CtbdLwpPHmlYl5LKhwXIzcPe2o="; + hash = "sha256-ZsjBgoTr4LGQW0kn+CtbdLwpPHmlYl5LKhwXIzcPe2o="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/iciclesoft.workspacesort/changelog"; @@ -2170,7 +2131,7 @@ let name = "vscode-ansi"; publisher = "iliazeus"; version = "1.1.6"; - sha256 = "sha256-ZPV8zd/GkXOGf6s8fz9ZPmC3i1jO0wFAqV0E67lW0do="; + hash = "sha256-ZPV8zd/GkXOGf6s8fz9ZPmC3i1jO0wFAqV0E67lW0do="; }; meta = { description = "ANSI color styling for text documents"; @@ -2185,7 +2146,7 @@ let publisher = "influxdata"; name = "flux"; version = "1.0.4"; - sha256 = "sha256-KIKROyfkosBS1Resgl+s3VENVg4ibaeIgKjermXESoA="; + hash = "sha256-KIKROyfkosBS1Resgl+s3VENVg4ibaeIgKjermXESoA="; }; meta = { license = lib.licenses.mit; @@ -2197,7 +2158,7 @@ let publisher = "intellsmi"; name = "comment-translate"; version = "2.2.4"; - sha256 = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU="; + hash = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU="; }; meta = { description = "A Visual Studio Code extension to translate the comments for computer language"; @@ -2216,8 +2177,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "7.17.0"; - sha256 = "sha256-CC6ySeuO61O/mAkQYGoK/1cd4hlyS0vG+Lqv0HQ7K6c="; + version = "7.18.2"; + hash = "sha256-CEeTLiZktp5YzCRxDXa+s8W9N971iQla/FyCr8Co0SQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; @@ -2234,7 +2195,7 @@ let name = "vscode-env"; publisher = "irongeek"; version = "0.1.0"; - sha256 = "sha256-URq90lOFtPCNfSIl2NUwihwRQyqgDysGmBc3NG7o7vk="; + hash = "sha256-URq90lOFtPCNfSIl2NUwihwRQyqgDysGmBc3NG7o7vk="; }; meta = { description = "Adds formatting and syntax highlighting support for env files (.env) to Visual Studio Code"; @@ -2245,6 +2206,8 @@ let }; }; + jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; @@ -2267,7 +2230,7 @@ let name = "vscode-emacs-minimum"; publisher = "jamesyang999"; version = "1.1.1"; - sha256 = "sha256-qxnAhT2UGTQmPw9XmdBdx0F0NNLAaU1/ES9jiqiRrGI="; + hash = "sha256-qxnAhT2UGTQmPw9XmdBdx0F0NNLAaU1/ES9jiqiRrGI="; }; meta = { description = "Minimal emacs key bindings for VSCode"; @@ -2282,7 +2245,7 @@ let name = "vscode-janet"; publisher = "janet-lang"; version = "0.0.2"; - sha256 = "sha256-oj0e++z2BtadIXOnTlocIIHliYweZ1iyrV08DwatfLI="; + hash = "sha256-oj0e++z2BtadIXOnTlocIIHliYweZ1iyrV08DwatfLI="; }; meta = { description = "Janet language support for Visual Studio Code"; @@ -2293,15 +2256,32 @@ let }; }; + jbockle.jbockle-format-files = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jbockle-format-files"; + publisher = "jbockle"; + version = "3.4.0"; + hash = "sha256-BHw+T2EPdQq/wOD5kzvSln5SBFTYUXip8QDjnAGBfFY="; + }; + meta = { + description = "A VSCode extension to formats all files in the current workspace"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jbockle.jbockle-format-files"; + homepage = "https://github.com/jbockle/format-files"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + jdinhlife.gruvbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.8.0"; - sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; + version = "1.18.0"; + hash = "sha256-4sGGVJYgQiOJzcnsT/YMdJdk0mTi7qcAcRHLnYghPh4="; }; meta = { - description = "Gruvbox Theme"; + changelog = "https://marketplace.visualstudio.com/items/jdinhlife.gruvbox/changelog"; + description = "A port of Gruvbox theme to VS Code editor"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=jdinhlife.gruvbox"; homepage = "https://github.com/jdinhify/vscode-theme-gruvbox"; license = lib.licenses.mit; @@ -2316,7 +2296,7 @@ let publisher = "jellyedwards"; name = "gitsweep"; version = "1.0.0"; - sha256 = "sha256-XBD8rN6E/0GjZ3zXgR45MN9v4PYrEXBSzN7+CcLrRsg="; + hash = "sha256-XBD8rN6E/0GjZ3zXgR45MN9v4PYrEXBSzN7+CcLrRsg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jellyedwards.gitsweep/changelog"; @@ -2333,7 +2313,7 @@ let publisher = "jkillian"; name = "custom-local-formatters"; version = "0.0.6"; - sha256 = "sha256-FYDkOuoiF/N24BFG9GOqtTDwq84txmaa1acdzfskf/c="; + hash = "sha256-FYDkOuoiF/N24BFG9GOqtTDwq84txmaa1acdzfskf/c="; }; meta = { license = lib.licenses.mit; @@ -2345,8 +2325,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.2.2"; - sha256 = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg="; + version = "0.3.1"; + hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -2363,7 +2343,7 @@ let name = "svg"; publisher = "jock"; version = "1.5.2"; - sha256 = "sha256-Ii2e65BJU+Vw3i8917dgZtGsiSn6qConu8SJ+IqF82U="; + hash = "sha256-Ii2e65BJU+Vw3i8917dgZtGsiSn6qConu8SJ+IqF82U="; }; meta = { license = lib.licenses.mit; @@ -2382,24 +2362,57 @@ let }; }; + julialang.language-julia = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "language-julia"; + publisher = "julialang"; + version = "1.75.2"; + hash = "sha256-wGguwyTy3jj89ud/nQw2vbtNxYuWkfi0qG6QGUyvuz4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog"; + description = "A Visual Studio Code extension for Julia programming language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=julialang.language-julia"; + homepage = "https://github.com/julia-vscode/julia-vscode"; + license = lib.licenses.mit; + }; + }; + justusadam.language-haskell = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-haskell"; publisher = "justusadam"; version = "3.6.0"; - sha256 = "sha256-rZXRzPmu7IYmyRWANtpJp3wp0r/RwB7eGHEJa7hBvoQ="; + hash = "sha256-rZXRzPmu7IYmyRWANtpJp3wp0r/RwB7eGHEJa7hBvoQ="; }; meta = { license = lib.licenses.bsd3; }; }; + k--kato.intellij-idea-keybindings = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "intellij-idea-keybindings"; + publisher = "k--kato"; + version = "1.7.0"; + hash = "sha256-mIcSZANZlj5iO2oLiJBUHn08rXVhu/9SKsRhlu/hcvI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog"; + description = "Visual Studio Code extension for IntelliJ IDEA keybindings"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=k--kato.intellij-idea-keybindings"; + homepage = "https://github.com/kasecato/vscode-intellij-idea-keybindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.t4sm5n ]; + }; + }; + kahole.magit = buildVscodeMarketplaceExtension { mktplcRef = { name = "magit"; publisher = "kahole"; version = "0.6.43"; - sha256 = "sha256-DPLlQ2IliyvzW8JvgVlGKNd2JjD/RbclNXU3gEFVhOE="; + hash = "sha256-DPLlQ2IliyvzW8JvgVlGKNd2JjD/RbclNXU3gEFVhOE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/kahole.magit/changelog"; @@ -2416,7 +2429,7 @@ let name = "balena-vscode"; publisher = "kalebpace"; version = "0.1.3"; - sha256 = "sha256-CecEv19nEtnMe0KlCMNBM9ZAjbAVgPNUcZ6cBxHw44M="; + hash = "sha256-CecEv19nEtnMe0KlCMNBM9ZAjbAVgPNUcZ6cBxHw44M="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/kalebpace.balena-vscode/changelog"; @@ -2428,33 +2441,7 @@ let }; }; - kamadorueda.alejandra = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "alejandra"; - publisher = "kamadorueda"; - version = "1.0.0"; - sha256 = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - - jq -e ' - .contributes.configuration.properties."alejandra.program".default = - "${alejandra}/bin/alejandra" | - .contributes.configurationDefaults."alejandra.program" = - "${alejandra}/bin/alejandra" - ' \ - < package.json \ - | sponge package.json - ''; - meta = { - description = "The Uncompromising Nix Code Formatter"; - homepage = "https://github.com/kamadorueda/alejandra"; - license = lib.licenses.unlicense; - maintainers = [ lib.maintainers.kamadorueda ]; - }; - }; + kamadorueda.alejandra = callPackage ./kamadorueda.alejandra { }; kamikillerto.vscode-colorize = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2487,12 +2474,18 @@ let name = "vscode-cfn-lint"; publisher = "kddejong"; version = "0.25.1"; - sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + hash = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; - buildInputs = [ cfn-lint pydot ]; + buildInputs = [ + cfn-lint + pydot + ]; postInstall = '' cd "$out/$installPrefix" @@ -2512,7 +2505,7 @@ let name = "nickel-syntax"; publisher = "kubukoz"; version = "0.0.2"; - sha256 = "sha256-ffPZd717Y2OF4d9MWE6zKwcsGWS90ZJvhWkqP831tVM="; + hash = "sha256-ffPZd717Y2OF4d9MWE6zKwcsGWS90ZJvhWkqP831tVM="; }; meta = { license = lib.licenses.asl20; @@ -2526,7 +2519,7 @@ let name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; version = "0.1.24"; - sha256 = "sha256-yOpsYjjwHRXxbiHDPgrtswUtgbQAo+3RgN2s6UYe9mg="; + hash = "sha256-yOpsYjjwHRXxbiHDPgrtswUtgbQAo+3RgN2s6UYe9mg="; }; meta = { description = "C/C++ completion, navigation, and insights"; @@ -2543,7 +2536,7 @@ let name = "i18n-ally"; publisher = "Lokalise"; version = "2.8.1"; - sha256 = "sha256-oDW7ijcObfOP7ZNggSHX0aiI5FkoJ/iQD92bRV0eWVQ="; + hash = "sha256-oDW7ijcObfOP7ZNggSHX0aiI5FkoJ/iQD92bRV0eWVQ="; }; meta = { license = lib.licenses.mit; @@ -2555,7 +2548,7 @@ let publisher = "lucperkins"; name = "vrl-vscode"; version = "0.1.4"; - sha256 = "sha256-xcGa43iPwUR6spOJGTmmWA1dOMNMQEdiuhMZPYZ+dTU="; + hash = "sha256-xcGa43iPwUR6spOJGTmmWA1dOMNMQEdiuhMZPYZ+dTU="; }; meta = { description = "VS Code extension for Vector Remap Language (VRL)"; @@ -2571,7 +2564,7 @@ let publisher = "mads-hartmann"; name = "bash-ide-vscode"; version = "1.36.0"; - sha256 = "sha256-DqY2PS4JSjb6VMO1b0Hi/7JOKSTUk5VSxJiCrUKBfLk="; + hash = "sha256-DqY2PS4JSjb6VMO1b0Hi/7JOKSTUk5VSxJiCrUKBfLk="; }; meta = { license = lib.licenses.mit; @@ -2584,7 +2577,7 @@ let name = "marp-vscode"; publisher = "marp-team"; version = "2.5.0"; - sha256 = "sha256-I8UevZs04tUj/jaHrU7LiMF40ElMqtniU1h/9LNLdac="; + hash = "sha256-I8UevZs04tUj/jaHrU7LiMF40ElMqtniU1h/9LNLdac="; }; meta = { license = lib.licenses.mit; @@ -2596,7 +2589,7 @@ let name = "mypy"; publisher = "matangover"; version = "0.2.3"; - sha256 = "sha256-m/8j89M340fiMF7Mi7FT2+Xag3fbMGWf8Gt9T8hLdmo="; + hash = "sha256-m/8j89M340fiMF7Mi7FT2+Xag3fbMGWf8Gt9T8hLdmo="; }; meta.license = lib.licenses.mit; }; @@ -2606,7 +2599,7 @@ let name = "Kotlin"; publisher = "mathiasfrohlich"; version = "1.7.1"; - sha256 = "sha256-MuAlX6cdYMLYRX2sLnaxWzdNPcZ4G0Fdf04fmnzQKH4="; + hash = "sha256-MuAlX6cdYMLYRX2sLnaxWzdNPcZ4G0Fdf04fmnzQKH4="; }; meta = { description = "Kotlin language support for VS Code"; @@ -2622,7 +2615,7 @@ let name = "caddyfile-support"; publisher = "matthewpi"; version = "0.3.0"; - sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY="; + hash = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY="; }; meta = { description = "Rich Caddyfile support for Visual Studio Code"; @@ -2639,7 +2632,7 @@ let name = "lisp"; publisher = "mattn"; version = "0.1.12"; - sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; + hash = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; }; meta = { description = "Lisp syntax for vscode"; @@ -2656,7 +2649,7 @@ let publisher = "maximedenes"; name = "vscoq"; version = "0.3.8"; - sha256 = "sha256-0FX5KBsvUmI+JMGBnaI3kJmmD+Y6XFl7LRHU0ADbHos="; + hash = "sha256-0FX5KBsvUmI+JMGBnaI3kJmmD+Y6XFl7LRHU0ADbHos="; }; meta = { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; @@ -2672,49 +2665,21 @@ let name = "rainbow-csv"; publisher = "mechatroner"; version = "3.6.0"; - sha256 = "sha256-bvxMnT6oSjflAwWQZkNnEoEsVlVg86T0TMYi8tNsbdQ="; + hash = "sha256-bvxMnT6oSjflAwWQZkNnEoEsVlVg86T0TMYi8tNsbdQ="; }; meta = { license = lib.licenses.mit; }; }; - # Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this - # extension - mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-preview"; - publisher = "mgt19937"; - version = "0.11.1"; - sha256 = "sha256-OsCgkq0OSBu7RZYHlxgy7W7zDNDUgJFSeSET20CX8zA="; - }; - - 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 ]; - }; - }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; publisher = "mhutchie"; version = "1.30.0"; - sha256 = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA="; + hash = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA="; }; meta = { license = lib.licenses.mit; @@ -2726,7 +2691,7 @@ let name = "dotenv"; publisher = "mikestead"; version = "1.0.1"; - sha256 = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc="; + hash = "sha256-dieCzNOIcZiTGu4Mv5zYlG7jLhaEsJR05qbzzzQ7RWc="; }; meta = { license = lib.licenses.mit; @@ -2749,10 +2714,9 @@ let mktplcRef = { name = "direnv"; publisher = "mkhl"; - version = "0.16.0"; - sha256 = "sha256-u2AFjvhm3zio1ygW9yD9ZwbywLrEssd0O7/0AtfCvMo="; + version = "0.17.0"; + hash = "sha256-9sFcfTMeLBGw2ET1snqQ6Uk//D/vcD9AVsZfnUNrWNg="; }; - meta = { description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; @@ -2766,7 +2730,7 @@ let name = "compare-folders"; publisher = "moshfeu"; version = "0.24.2"; - sha256 = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; + hash = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; }; meta = { @@ -2782,16 +2746,20 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.24.0"; - sha256 = "sha256-zZ34KQrRPqVbfGdpYACuLMiMj4ZIWSnJIPac1yXD87k="; + version = "1.29.0"; + hash = "sha256-mVRsVsolXj31WhbWnt3Xml+NnIq7Q2uHhUUd1zgW42c="; }; meta = { + description = "Docker Extension for Visual Studio Code"; + homepage = "https://github.com/microsoft/vscode-docker"; + changelog = "https://marketplace.visualstudio.com/items/ms-azuretools.vscode-docker/changelog"; license = lib.licenses.mit; }; }; ms-ceintl = callPackage ./language-packs.nix { }; # non-English language packs + ms-dotnettools.csdevkit = callPackage ./ms-dotnettools.csdevkit { }; ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { }; ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { @@ -2799,7 +2767,7 @@ let name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; version = "1.3.11"; - sha256 = "sha256-I2ud9d4VtgiiIT0MeoaMThgjLYtSuftFVZHVJTMlJ8s="; + hash = "sha256-I2ud9d4VtgiiIT0MeoaMThgjLYtSuftFVZHVJTMlJ8s="; }; meta = { license = lib.licenses.mit; @@ -2811,7 +2779,7 @@ let name = "pyright"; publisher = "ms-pyright"; version = "1.1.300"; - sha256 = "sha256-GzRJeV4qfgM2kBv6U3MH7lMWl3CL6LWPI/9GaVWZL+o="; + hash = "sha256-GzRJeV4qfgM2kBv6U3MH7lMWl3CL6LWPI/9GaVWZL+o="; }; meta = { description = "VS Code static type checking for Python"; @@ -2828,7 +2796,7 @@ let name = "black-formatter"; publisher = "ms-python"; version = "2023.4.1"; - sha256 = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; + hash = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; }; meta = with lib; { description = "Formatter extension for Visual Studio Code using black"; @@ -2844,7 +2812,7 @@ let name = "isort"; publisher = "ms-python"; version = "2023.10.1"; - sha256 = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU="; + hash = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU="; }; meta = with lib; { description = "Import sorting extension for Visual Studio Code using isort"; @@ -2857,23 +2825,22 @@ let ms-python.python = callPackage ./ms-python.python { }; - ms-python.vscode-pylance = buildVscodeMarketplaceExtension { + ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; + + ms-toolsai.datawrangler = buildVscodeMarketplaceExtension { mktplcRef = { - name = "vscode-pylance"; - publisher = "MS-python"; - version = "2023.8.50"; - sha256 = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; + name = "datawrangler"; + publisher = "ms-toolsai"; + version = "0.29.6"; + hash = "sha256-9MR2+hb9YdjIGDfUkdLW41HOxhjeS/San49C8QRZ/YY="; }; - buildInputs = [ nodePackages.pyright ]; - meta = { - changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; - description = "A performant, feature-rich language server for Python in VS Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; - homepage = "https://github.com/microsoft/pylance-release"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ericthemagician ]; + description = "Data viewing, cleaning and preparation for tabular datasets"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-toolsai.datawrangler"; + homepage = "https://github.com/microsoft/vscode-data-wrangler"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.katanallama ]; }; }; @@ -2884,7 +2851,7 @@ let name = "jupyter-keymap"; publisher = "ms-toolsai"; version = "1.1.0"; - sha256 = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; + hash = "sha256-krDtR+ZJiJf1Kxcu5mdXOaSAiJb2bXC1H0XWWviWeMQ="; }; meta = { license = lib.licenses.mit; @@ -2896,7 +2863,7 @@ let name = "jupyter-renderers"; publisher = "ms-toolsai"; version = "1.0.15"; - sha256 = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; + hash = "sha256-JR6PunvRRTsSqjSGGAn/1t1B+Ia6X0MgqahehcuSNYA="; }; meta = { license = lib.licenses.mit; @@ -2908,7 +2875,7 @@ let name = "vscode-jupyter-cell-tags"; publisher = "ms-toolsai"; version = "0.1.8"; - sha256 = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; + hash = "sha256-0oPyptnUWL1h/H13SdR+FdgGzVwEpTaK9SCE7BvI/5M="; }; meta = { license = lib.licenses.mit; @@ -2932,7 +2899,7 @@ let name = "anycode"; publisher = "ms-vscode"; version = "0.0.70"; - sha256 = "sha256-POxgwvKF4A+DxKVIOte4I8REhAbO1U9Gu6r/S41/MmA="; + hash = "sha256-POxgwvKF4A+DxKVIOte4I8REhAbO1U9Gu6r/S41/MmA="; }; meta = { license = lib.licenses.mit; @@ -2944,7 +2911,7 @@ let name = "cmake-tools"; publisher = "ms-vscode"; version = "1.14.20"; - sha256 = "sha256-j67Z65N9YW8wY4zIWWCtPIKgW9GYoUntBoGVBLR/H2o="; + hash = "sha256-j67Z65N9YW8wY4zIWWCtPIKgW9GYoUntBoGVBLR/H2o="; }; meta.license = lib.licenses.mit; }; @@ -2956,7 +2923,7 @@ let name = "cpptools-extension-pack"; publisher = "ms-vscode"; version = "1.3.0"; - sha256 = "sha256-rHST7CYCVins3fqXC+FYiS5Xgcjmi7QW7M4yFrUR04U="; + hash = "sha256-rHST7CYCVins3fqXC+FYiS5Xgcjmi7QW7M4yFrUR04U="; }; meta = { description = "Popular extensions for C++ development in Visual Studio Code."; @@ -2972,7 +2939,7 @@ let name = "hexeditor"; publisher = "ms-vscode"; version = "1.9.11"; - sha256 = "sha256-w1R8z7Q/JRAsqJ1mgcvlHJ6tywfgKtS6A6zOY2p01io="; + hash = "sha256-w1R8z7Q/JRAsqJ1mgcvlHJ6tywfgKtS6A6zOY2p01io="; }; meta = { license = lib.licenses.mit; @@ -2984,7 +2951,7 @@ let name = "live-server"; publisher = "ms-vscode"; version = "0.4.8"; - sha256 = "sha256-/IrLq+nNxwQB1S1NIGYkv24DOY7Mc25eQ+orUfh42pg="; + hash = "sha256-/IrLq+nNxwQB1S1NIGYkv24DOY7Mc25eQ+orUfh42pg="; }; meta = { description = "Launch a development local Server with live reload feature for static & dynamic pages"; @@ -3011,7 +2978,7 @@ let name = "PowerShell"; publisher = "ms-vscode"; version = "2023.3.1"; - sha256 = "sha256-FJolnWU0DbuQYvMuGL3mytf0h39SH9rUPCl2ahLXLuY="; + hash = "sha256-FJolnWU0DbuQYvMuGL3mytf0h39SH9rUPCl2ahLXLuY="; }; meta = { description = "A Visual Studio Code extension for PowerShell language support"; @@ -3022,12 +2989,27 @@ let }; }; + ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "test-adapter-converter"; + publisher = "ms-vscode"; + version = "0.1.9"; + hash = "sha256-M53jhAVawk2yCeSrLkWrUit3xbDc0zgCK2snbK+BaSs="; + }; + meta = { + description = "A Visual Studio Code extension that converts from the Test Explorer UI API into native VS Code testing"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.test-adapter-converter"; + homepage = "https://github.com/microsoft/vscode-test-adapter-converter"; + license = lib.licenses.mit; + }; + }; + ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { mktplcRef = { name = "Theme-TomorrowKit"; publisher = "ms-vscode"; version = "0.1.4"; - sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; + hash = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; }; meta = { description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; @@ -3042,8 +3024,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.305.0"; - sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc="; + version = "0.347.0"; + hash = "sha256-E9H1nPWG5JuzBxbYc/yWd8Y3azEWrd9whGirl0GK7kU="; }; meta = { description = "Open any folder or repository inside a Docker container."; @@ -3058,12 +3040,29 @@ let ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; + mshr-h.veriloghdl = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "veriloghdl"; + publisher = "mshr-h"; + version = "1.13.2"; + hash = "sha256-MOU8zf2qS7P2pQ29w3mvhDc2OvZiH4HNe530BjIiRAA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; + description = "A Visual Studio Code extension for supporting Verilog-HDL, SystemVerilog, Bluespec and SystemVerilog"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mshr-h.VerilogHDL"; + homepage = "https://github.com/mshr-h/vscode-verilog-hdl-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.newam ]; + }; + }; + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "one-dark-theme"; publisher = "mskelton"; version = "1.14.2"; - sha256 = "sha256-6nIfEPbau5Dy1DGJ0oQ5L2EGn2NDhpd8jSdYujtOU68="; + hash = "sha256-6nIfEPbau5Dy1DGJ0oQ5L2EGn2NDhpd8jSdYujtOU68="; }; meta = { license = lib.licenses.mit; @@ -3075,7 +3074,7 @@ let name = "npm-outdated"; publisher = "mskelton"; version = "2.2.0"; - sha256 = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E="; + hash = "sha256-kHItIlTW+PIVXrLgzdGAoPeR6sWKuKl/QyJ5+TIv3/E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mskelton.npm-outdated/changelog"; @@ -3091,19 +3090,21 @@ let publisher = "mvllow"; name = "rose-pine"; version = "2.7.1"; - sha256 = "sha256-QQIkuJAI4apDt8rfhXvMg9bNtGTFeMaEkN/Se12zGpc="; + hash = "sha256-QQIkuJAI4apDt8rfhXvMg9bNtGTFeMaEkN/Se12zGpc="; }; meta = { license = lib.licenses.mit; }; }; + myriad-dreamin.tinymist = callPackage ./myriad-dreamin.tinymist { }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; publisher = "naumovs"; version = "2.6.0"; - sha256 = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; + hash = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; @@ -3120,7 +3121,7 @@ let name = "theme-oceanicnext"; publisher = "naumovs"; version = "0.0.4"; - sha256 = "sha256-romhWL3s0NVZ3kptSNT4/X9WkgakgNNfFElaBCo6jj4="; + hash = "sha256-romhWL3s0NVZ3kptSNT4/X9WkgakgNNfFElaBCo6jj4="; }; meta = { description = "Oceanic Next theme for VSCode + dimmed bg version for better looking UI"; @@ -3136,7 +3137,7 @@ let name = "autodocstring"; publisher = "njpwerner"; version = "0.6.1"; - sha256 = "sha256-NI0cbjsZPW8n6qRTRKoqznSDhLZRUguP7Sa/d0feeoc="; + hash = "sha256-NI0cbjsZPW8n6qRTRKoqznSDhLZRUguP7Sa/d0feeoc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/njpwerner.autodocstring/changelog"; @@ -3153,7 +3154,7 @@ let name = "dark-molokai-theme"; publisher = "nonylene"; version = "1.0.5"; - sha256 = "sha256-2qjV6iSz8DDU1yP1II9sxGSgiETmEtotFvfNjm+cTuI="; + hash = "sha256-2qjV6iSz8DDU1yP1II9sxGSgiETmEtotFvfNjm+cTuI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nonylene.dark-molokai-theme/changelog"; @@ -3170,7 +3171,7 @@ let name = "just-black"; publisher = "nur"; version = "3.1.1"; - sha256 = "sha256-fatJZquCDsLDFGVzBol2D6LIZUbZ6GzqcVEFAwLodW0="; + hash = "sha256-fatJZquCDsLDFGVzBol2D6LIZUbZ6GzqcVEFAwLodW0="; }; meta = { description = "A dark theme designed specifically for syntax highlighting"; @@ -3181,36 +3182,7 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-lsp"; - publisher = "nvarner"; - # Please update the corresponding binary (typst-lsp) when updating - # this extension. - version = "0.12.1"; - sha256 = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; - }; - - nativeBuildInputs = [ jq moreutils ]; - - buildInputs = [ - typst-lsp - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json - ''; - - meta = { - changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; - description = "A VSCode extension for providing a language server for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; - homepage = "https://github.com/nvarner/typst-lsp"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; - }; + nvarner.typst-lsp = callPackage ./nvarner.typst-lsp { }; ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension { meta = { @@ -3225,7 +3197,7 @@ let name = "ocaml-platform"; publisher = "ocamllabs"; version = "1.12.2"; - sha256 = "sha256-dj8UFbYgAl6dt/1MuIBawTVUbBDTTedZEcHtKZjEcew="; + hash = "sha256-dj8UFbYgAl6dt/1MuIBawTVUbBDTTedZEcHtKZjEcew="; }; }; @@ -3234,7 +3206,7 @@ let name = "vetur"; publisher = "octref"; version = "0.37.3"; - sha256 = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; + hash = "sha256-3hi1LOZto5AYaomB9ihkAt4j/mhkCDJ8Jqa16piwHIQ="; }; meta = { license = lib.licenses.mit; @@ -3246,7 +3218,7 @@ let name = "indent-rainbow"; publisher = "oderwat"; version = "8.3.1"; - sha256 = "sha256-dOicya0B2sriTcDSdCyhtp0Mcx5b6TUaFKVb0YU3jUc="; + hash = "sha256-dOicya0B2sriTcDSdCyhtp0Mcx5b6TUaFKVb0YU3jUc="; }; meta = { description = "Makes indentation easier to read"; @@ -3262,7 +3234,7 @@ let name = "phoenix"; publisher = "phoenixframework"; version = "0.1.2"; - sha256 = "sha256-T+YNRR8jAzNagmoCDzjbytBDFtPhNn289Kywep/w8sw="; + hash = "sha256-T+YNRR8jAzNagmoCDzjbytBDFtPhNn289Kywep/w8sw="; }; meta = { description = "Syntax highlighting support for HEEx / Phoenix templates"; @@ -3278,7 +3250,7 @@ let name = "adwaita-theme"; publisher = "piousdeer"; version = "1.1.0"; - sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; + hash = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; meta = { description = "Theme for the GNOME desktop"; @@ -3306,7 +3278,7 @@ let name = "material-product-icons"; publisher = "PKief"; version = "1.5.0"; - sha256 = "sha256-gKU21OS2ZFyzCQVQ1fa3qlahLBAcJaHDEcz7xof3P4A="; + hash = "sha256-gKU21OS2ZFyzCQVQ1fa3qlahLBAcJaHDEcz7xof3P4A="; }; meta = { license = lib.licenses.mit; @@ -3318,7 +3290,7 @@ let name = "prisma"; publisher = "Prisma"; version = "4.11.0"; - sha256 = "sha256-fHvwv9E/O8ZvhnyY7nNF/SIyl87z8KVEXTbhU/37EP0="; + hash = "sha256-fHvwv9E/O8ZvhnyY7nNF/SIyl87z8KVEXTbhU/37EP0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -3335,7 +3307,7 @@ let name = "gpt-pilot-vs-code"; publisher = "PythagoraTechnologies"; version = "0.1.7"; - sha256 = "sha256-EUddanrB6h5cn3pK2JTkEPffVb06ZMI2qDPh0kFfJjA="; + hash = "sha256-EUddanrB6h5cn3pK2JTkEPffVb06ZMI2qDPh0kFfJjA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/PythagoraTechnologies.gpt-pilot-vs-code/changelog"; @@ -3352,7 +3324,7 @@ let name = "quicktype"; publisher = "quicktype"; version = "12.0.46"; - sha256 = "sha256-NTZ0BujnA+COg5txOLXSZSp8TPD1kZNfZPjnvZUL9lc="; + hash = "sha256-NTZ0BujnA+COg5txOLXSZSp8TPD1kZNfZPjnvZUL9lc="; }; meta = { description = "Infer types from sample JSON data"; @@ -3367,7 +3339,7 @@ let name = "ruby"; publisher = "rebornix"; version = "0.28.1"; - sha256 = "sha256-HAUdv+2T+neJ5aCGiQ37pCO6x6r57HIUnLm4apg9L50="; + hash = "sha256-HAUdv+2T+neJ5aCGiQ37pCO6x6r57HIUnLm4apg9L50="; }; meta.license = lib.licenses.mit; @@ -3378,7 +3350,7 @@ let name = "ansible"; publisher = "redhat"; version = "2.12.143"; - sha256 = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok="; + hash = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok="; }; meta = { description = "Ansible language support"; @@ -3393,13 +3365,18 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.17.2023032504"; - sha256 = "sha256-ni1jzCPjwtcdJTEORn0vYzLRbQ/wseTZmrETJ8QPW58="; + version = "1.30.2024041908"; + hash = "sha256-2VaB7duzDmoQYxLHIuC9yghJvmVnWJIBfH75xq5ljPg="; }; buildInputs = [ jdk ]; meta = { + description = "Java language support for VS Code via the Eclipse JDT Language Server"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=redhat.java"; + homepage = "https://github.com/redhat-developer/vscode-java"; + changelog = "https://marketplace.visualstudio.com/items/redhat.java/changelog"; license = lib.licenses.epl20; - broken = lib.versionOlder jdk.version "11"; + maintainers = [ lib.maintainers.wackbyte ]; + broken = lib.versionOlder jdk.version "17"; }; }; @@ -3430,7 +3407,7 @@ let name = "reloaded-cpp"; publisher = "reloadedextensions"; version = "0.1.9"; - sha256 = "sha256-KQiSD18W9NnsqhRt+XM3ko70u4zX4enn3OpMt0ebViU="; + hash = "sha256-KQiSD18W9NnsqhRt+XM3ko70u4zX4enn3OpMt0ebViU="; }; meta = { description = "C/C++ must-have highlighter that understands many coding styles and APIs. Use with 'Reloaded Themes' extension."; @@ -3458,7 +3435,7 @@ let name = "commandOnAllFiles"; publisher = "rioj7"; version = "0.3.2"; - sha256 = "sha256-777jdBpWJ66ASeeETWevWF4mIAj4RWviNSTxzvqwl0U="; + hash = "sha256-777jdBpWJ66ASeeETWevWF4mIAj4RWviNSTxzvqwl0U="; }; meta = { license = lib.licenses.mit; @@ -3470,7 +3447,7 @@ let name = "liveserver"; publisher = "ritwickdey"; version = "5.7.9"; - sha256 = "sha256-w0CYSEOdltwMFzm5ZhOxSrxqQ1y4+gLfB8L+EFFgzDc="; + hash = "sha256-w0CYSEOdltwMFzm5ZhOxSrxqQ1y4+gLfB8L+EFFgzDc="; }; meta = { license = lib.licenses.mit; @@ -3482,7 +3459,7 @@ let name = "ayu-next"; publisher = "roman"; version = "1.2.15"; - sha256 = "sha256-gGEjb9BrvFmKhAxRUmN3YWx7VZqlUp6w7m4r46DPn50="; + hash = "sha256-gGEjb9BrvFmKhAxRUmN3YWx7VZqlUp6w7m4r46DPn50="; }; meta = { license = lib.licenses.mit; @@ -3591,7 +3568,7 @@ let name = "scala"; publisher = "scala-lang"; version = "0.5.6"; - sha256 = "sha256-eizIPazqEb27aQ+o9nTD1O58zbjkHYHNhGjK0uJgnwA="; + hash = "sha256-eizIPazqEb27aQ+o9nTD1O58zbjkHYHNhGjK0uJgnwA="; }; meta = { license = lib.licenses.mit; @@ -3603,7 +3580,7 @@ let name = "metals"; publisher = "scalameta"; version = "1.22.3"; - sha256 = "sha256-iLLWobQv5CEjJwCdDNdWYQ1ehOiYyNi940b4QmNZFoQ="; + hash = "sha256-iLLWobQv5CEjJwCdDNdWYQ1ehOiYyNi940b4QmNZFoQ="; }; meta = { license = lib.licenses.asl20; @@ -3615,7 +3592,7 @@ let publisher = "seatonjiang"; name = "gitmoji-vscode"; version = "1.2.2"; - sha256 = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w="; + hash = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w="; }; meta = { description = "Gitmoji tool for git commit messages in VSCode"; @@ -3631,7 +3608,7 @@ let name = "crates"; publisher = "serayuzgur"; version = "0.6.6"; - sha256 = "sha256-HXoH1IgMLniq0kxHs2snym4rerScu9qCqUaqwEC+O/E="; + hash = "sha256-HXoH1IgMLniq0kxHs2snym4rerScu9qCqUaqwEC+O/E="; }; meta = { license = lib.licenses.mit; @@ -3644,7 +3621,7 @@ let publisher = "shardulm94"; name = "trailing-spaces"; version = "0.4.1"; - sha256 = "sha256-pLE1bfLRxjlm/kgU9nmtiPBOnP05giQnWq6bexrrIZY="; + hash = "sha256-pLE1bfLRxjlm/kgU9nmtiPBOnP05giQnWq6bexrrIZY="; }; meta = { license = lib.licenses.mit; @@ -3657,7 +3634,7 @@ let publisher = "shd101wyy"; name = "markdown-preview-enhanced"; version = "0.8.12"; - sha256 = "sha256-4Iq6idux029i7cBV3x79ZRAbSk3ymqx+Q2jv0zV9ZTI="; + hash = "sha256-4Iq6idux029i7cBV3x79ZRAbSk3ymqx+Q2jv0zV9ZTI="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -3679,7 +3656,7 @@ let publisher = "shopify"; name = "ruby-lsp"; version = "0.5.8"; - sha256 = "sha256-1FfBnw98SagHf1P7udWzMU6BS5dBihpeRj4qv9S4ZHw="; + hash = "sha256-1FfBnw98SagHf1P7udWzMU6BS5dBihpeRj4qv9S4ZHw="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; @@ -3699,12 +3676,29 @@ let }; }; + signageos.signageos-vscode-sops = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "signageos-vscode-sops"; + publisher = "signageos"; + version = "0.9.1"; + hash = "sha256-b1Gp+tL5/e97xMuqkz4EvN0PxI7cJOObusEkcp+qKfM="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog"; + description = "A Visual Studio Code extension for SOPS support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops"; + homepage = "https://github.com/signageos/vscode-sops"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.superherointj ]; + }; + }; + silofy.hackthebox = buildVscodeMarketplaceExtension { mktplcRef = { name = "hackthebox"; publisher = "silofy"; version = "0.2.9"; - sha256 = "sha256-WSPuEh+osu0DpXgPAzMU5Fw0Sh8sZFst7kx26s2BsyQ="; + hash = "sha256-WSPuEh+osu0DpXgPAzMU5Fw0Sh8sZFst7kx26s2BsyQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/silofy.hackthebox/changelog"; @@ -3721,7 +3715,7 @@ let name = "just"; publisher = "skellock"; version = "2.0.0"; - sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; + hash = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; }; meta = { changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; @@ -3757,16 +3751,35 @@ let }; }; + smcpeak.default-keys-windows = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "default-keys-windows"; + publisher = "smcpeak"; + version = "0.0.10"; + hash = "sha256-v1JY5ZGWOfF14H235Y9CLlPwIvmNwCeRhIkdmcgCCFU="; + }; + meta = { + changelog = "https://github.com/smcpeak/vscode-default-keys-windows/blob/master/CHANGELOG.md"; + description = "VSCode extension that provides default Windows keybindings on any platform"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=smcpeak.default-keys-windows"; + homepage = "https://github.com/smcpeak/vscode-default-keys-windows"; + license = lib.licenses.mit; + maintainers = [ ]; + }; + }; + sonarsource.sonarlint-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "sonarlint-vscode"; publisher = "sonarsource"; version = "3.16.0"; - sha256 = "sha256-zWgITdvUS9fq1uT6A4Gs3fSTBwCXoEIQ/tVcC7Eigfs="; + hash = "sha256-zWgITdvUS9fq1uT6A4Gs3fSTBwCXoEIQ/tVcC7Eigfs="; }; meta.license = lib.licenses.lgpl3Only; }; + sourcery.sourcery = callPackage ./sourcery.sourcery { }; + spywhere.guides = buildVscodeMarketplaceExtension { mktplcRef = { name = "guides"; @@ -3800,7 +3813,7 @@ let name = "vscode-tmux-keybinding"; publisher = "stephlin"; version = "0.0.7"; - sha256 = "sha256-MrW0zInweAhU2spkEEiDLyuT6seV3GFFurWTqYMzqgY="; + hash = "sha256-MrW0zInweAhU2spkEEiDLyuT6seV3GFFurWTqYMzqgY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; @@ -3817,7 +3830,7 @@ let publisher = "stkb"; name = "rewrap"; version = "17.8.0"; - sha256 = "sha256-9t1lpVbpcmhLamN/0ZWNEWD812S6tXG6aK3/ALJCJvg="; + hash = "sha256-9t1lpVbpcmhLamN/0ZWNEWD812S6tXG6aK3/ALJCJvg="; }; meta = { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; @@ -3834,7 +3847,7 @@ let name = "code-spell-checker"; publisher = "streetsidesoftware"; version = "3.0.1"; - sha256 = "sha256-KeYE6/yO2n3RHPjnJOnOyHsz4XW81y9AbkSC/I975kQ="; + hash = "sha256-KeYE6/yO2n3RHPjnJOnOyHsz4XW81y9AbkSC/I975kQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -3851,7 +3864,7 @@ let name = "vscode-styled-components"; publisher = "styled-components"; version = "1.7.6"; - sha256 = "sha256-ZXXXFUriu//2Wmj1N+plj7xzJauGBfj+79SyrkUZAO4="; + hash = "sha256-ZXXXFUriu//2Wmj1N+plj7xzJauGBfj+79SyrkUZAO4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/styled-components.vscode-styled-components/changelog"; @@ -3867,7 +3880,7 @@ let name = "vscode-stylelint"; publisher = "stylelint"; version = "1.3.0"; - sha256 = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA="; + hash = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA="; }; meta = { description = "Official Stylelint extension for Visual Studio Code"; @@ -3880,12 +3893,33 @@ let sumneko.lua = callPackage ./sumneko.lua { }; + supermaven.supermaven = buildVscodeMarketplaceExtension { + mktplcRef = { + hash = "sha256-O3AN8fy28ZSun+k6MJnJdFcmwDDE21ib+I9HtDE0JwU="; + name = "supermaven"; + publisher = "supermaven"; + version = "0.1.42"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/supermaven.supermaven/changelog"; + description = "A Visual Studio Code extension for code completion suggestions"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=supermaven.supermaven"; + homepage = "https://supermaven.com/"; + license = lib.licenses.unfree; + longDescription = '' + Supermaven uses a 300,000 token context window to provide you the best code completion suggestions and the lowest latency. + With our extension you will get the fastest and best completions of any tool on the market. + ''; + maintainers = [ lib.maintainers.msanft ]; + }; + }; + svelte.svelte-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "107.12.0"; - sha256 = "036ri011fd0cf91iwv59j57m05mxliy27ms4di2y9jlk7jzmr4s2"; + version = "108.3.3"; + hash = "sha256-q7w8DPzBLpD+13v7RnyDdC3ocDKAihHBVt3pnwSTwio="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -3902,7 +3936,7 @@ let name = "markdown-memo"; publisher = "svsool"; version = "0.3.19"; - sha256 = "sha256-JRM9Tm7yql7dKXOdpTwBVR/gx/nwvM7qqrCNlV2i1uI="; + hash = "sha256-JRM9Tm7yql7dKXOdpTwBVR/gx/nwvM7qqrCNlV2i1uI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; @@ -3919,7 +3953,7 @@ let name = "tabnine-vscode"; publisher = "tabnine"; version = "3.6.43"; - sha256 = "sha256-/onQybGMBscD6Rj4PWafetuag1J1cgHTw5NHri082cs="; + hash = "sha256-/onQybGMBscD6Rj4PWafetuag1J1cgHTw5NHri082cs="; }; meta = { license = lib.licenses.mit; @@ -3948,7 +3982,7 @@ let publisher = "takayama"; name = "vscode-qq"; version = "1.4.2"; - sha256 = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng="; + hash = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng="; }; meta = { license = lib.licenses.mpl20; @@ -3960,7 +3994,7 @@ let name = "icons"; publisher = "tal7aouy"; version = "3.8.0"; - sha256 = "sha256-PdhNFyVUWcOfli/ZlT+6TmtWrV31fBP1E1Vd4QWOY+A="; + hash = "sha256-PdhNFyVUWcOfli/ZlT+6TmtWrV31fBP1E1Vd4QWOY+A="; }; meta = { description = "Icons for Visual Studio Code."; @@ -3976,19 +4010,34 @@ let name = "even-better-toml"; publisher = "tamasfe"; version = "0.19.2"; - sha256 = "sha256-JKj6noi2dTe02PxX/kS117ZhW8u7Bhj4QowZQiJKP2E="; + hash = "sha256-JKj6noi2dTe02PxX/kS117ZhW8u7Bhj4QowZQiJKP2E="; }; meta = { license = lib.licenses.mit; }; }; + teabyii.ayu = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu"; + publisher = "teabyii"; + version = "1.0.5"; + sha256 = "sha256-+IFqgWliKr+qjBLmQlzF44XNbN7Br5a119v9WAnZOu4="; + }; + meta = { + description = "A simple theme with bright colors and comes in three versions — dark, light and mirage for all day long comfortable work."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teabyii.ayu"; + homepage = "https://github.com/ayu-theme/vscode-ayu"; + license = lib.licenses.mit; + }; + }; + techtheawesome.rust-yew = buildVscodeMarketplaceExtension { mktplcRef = { name = "rust-yew"; publisher = "techtheawesome"; version = "0.2.2"; - sha256 = "sha256-t9DYY1fqW7M5F1pbIUtnnodxMzIzURew4RXT78djWMI="; + hash = "sha256-t9DYY1fqW7M5F1pbIUtnnodxMzIzURew4RXT78djWMI="; }; meta = { description = "A VSCode extension that provides some language features for Yew's html macro syntax"; @@ -4019,8 +4068,8 @@ let mktplcRef = { name = "vscode-nushell-lang"; publisher = "thenuprojectcontributors"; - version = "1.1.0"; - sha256 = "sha256-7v4q0OEqv7q2ejHp4lph2Dsqg0GWE65pxyz9goQEm8g="; + version = "1.9.0"; + hash = "sha256-E9CK/GChd/yZT+P3ttROjL2jHtKPJ0KZzc32/nbuE4w="; }; meta.license = lib.licenses.mit; }; @@ -4030,7 +4079,7 @@ let name = "hacker-theme"; publisher = "thorerik"; version = "3.0.1"; - sha256 = "sha256-Ugk9kTJxW1kbD+X6PF96WBc1k7x4KaGu5WbCYPGQ3qE="; + hash = "sha256-Ugk9kTJxW1kbD+X6PF96WBc1k7x4KaGu5WbCYPGQ3qE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/thorerik.hacker-theme/changelog"; @@ -4047,7 +4096,7 @@ let name = "zig"; publisher = "tiehuis"; version = "0.2.6"; - sha256 = "sha256-s0UMY0DzEufEF+pizYeH4MKYOiiJ6z05gYHvfpaS4zA="; + hash = "sha256-s0UMY0DzEufEF+pizYeH4MKYOiiJ6z05gYHvfpaS4zA="; }; meta = { license = lib.licenses.mit; @@ -4059,7 +4108,7 @@ let name = "helm-intellisense"; publisher = "Tim-Koehler"; version = "0.14.3"; - sha256 = "sha256-TcXn8n6mKEFpnP8dyv+nXBjsyfUfJNgdL9iSZwA5eo0="; + hash = "sha256-TcXn8n6mKEFpnP8dyv+nXBjsyfUfJNgdL9iSZwA5eo0="; }; meta = { description = "Extension to help writing Helm-Templates by providing intellisense"; @@ -4069,29 +4118,14 @@ let }; }; - timonwong.shellcheck = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "shellcheck"; - publisher = "timonwong"; - version = "0.26.3"; - sha256 = "GlyOLc2VrRnA50MkaG83qa0yLUyJYwueqEO+ZeAStYs="; - }; - nativeBuildInputs = [ jq moreutils ]; - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json - ''; - meta = { - license = lib.licenses.mit; - }; - }; + timonwong.shellcheck = callPackage ./timonwong.shellcheck { }; tobiasalthoff.atom-material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "atom-material-theme"; publisher = "tobiasalthoff"; version = "1.10.9"; - sha256 = "sha256-EdU0FMkaQpwhOpPRC+HGIxcrt7kSN+l4+mSgIwogB/I="; + hash = "sha256-EdU0FMkaQpwhOpPRC+HGIxcrt7kSN+l4+mSgIwogB/I="; }; meta = { license = lib.licenses.mit; @@ -4103,7 +4137,7 @@ let name = "pdf"; publisher = "tomoki1207"; version = "1.2.2"; - sha256 = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; + hash = "sha256-i3Rlizbw4RtPkiEsodRJEB3AUzoqI95ohyqZ0ksROps="; }; meta = { description = "Show PDF preview in VSCode"; @@ -4117,7 +4151,7 @@ let name = "opa"; publisher = "tsandall"; version = "0.12.2"; - sha256 = "sha256-/eJzDhnQyvC9OBr4M03wLIWPiBeVtvX7ztSnO+YoCZM="; + hash = "sha256-/eJzDhnQyvC9OBr4M03wLIWPiBeVtvX7ztSnO+YoCZM="; }; meta = { changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; @@ -4133,7 +4167,7 @@ let name = "emacs-mcx"; publisher = "tuttieee"; version = "0.47.0"; - sha256 = "sha256-dGty5+1+JEtJgl/DiyqEB/wuf3K8tCj1qWKua6ongIs="; + hash = "sha256-dGty5+1+JEtJgl/DiyqEB/wuf3K8tCj1qWKua6ongIs="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -4148,7 +4182,7 @@ let name = "vscode-testscript"; publisher = "twpayne"; version = "0.0.4"; - sha256 = "sha256-KOmcJlmmdUkC+q0AQ/Q/CQAeRgQPr6nVO0uccUxHmsY="; + hash = "sha256-KOmcJlmmdUkC+q0AQ/Q/CQAeRgQPr6nVO0uccUxHmsY="; }; meta = { description = "Syntax highlighting support for testscript"; @@ -4175,7 +4209,7 @@ let name = "sort-lines"; publisher = "Tyriar"; version = "1.10.2"; - sha256 = "sha256-AI16YBmmfZ3k7OyUrh4wujhu7ptqAwfI5jBbAc6MhDk="; + hash = "sha256-AI16YBmmfZ3k7OyUrh4wujhu7ptqAwfI5jBbAc6MhDk="; }; meta = { license = lib.licenses.mit; @@ -4186,15 +4220,19 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.39"; - sha256 = "sha256-B+p5bIwVhzWAdKQPCGPlImQihYCeTtYFTlkZIkgWayk="; + version = "0.0.42"; + hash = "sha256-cgLWgMej1Nv8kNK2MfgO3Z/xJPXdcmYs8LXrFNfc3jQ="; }; meta = { description = "VSCode language extension for Uiua"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; homepage = "https://github.com/uiua-lang/uiua-vscode"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tomasajt wackbyte defelo ]; + maintainers = with lib.maintainers; [ + tomasajt + wackbyte + defelo + ]; }; }; @@ -4221,7 +4259,7 @@ let name = "vscode-mdx"; publisher = "unifiedjs"; version = "1.4.0"; - sha256 = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg="; + hash = "sha256-qqqq0QKTR0ZCLdPltsnQh5eTqGOh9fV1OSOZMjj4xXg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog"; @@ -4236,12 +4274,12 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.14.0"; - sha256 = "0k70f5f4hcv3jl3a04736ml8amx8w7wb3mb8f6l5gngnvq9fj528"; + version = "3.16.0"; + hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; - description = "Improve highlighting of errors, warnings and other language diagnostics."; + description = "A Visual Studio Code extension that improves highlighting of errors, warnings and other language diagnostics"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens"; homepage = "https://github.com/usernamehw/vscode-error-lens"; license = lib.licenses.mit; @@ -4264,7 +4302,10 @@ let sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; buildInputs = [ jdk ]; @@ -4284,7 +4325,7 @@ let name = "vscode-pitch-black-theme"; publisher = "ViktorQvarfordt"; version = "1.3.0"; - sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; + hash = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; }; meta = { license = lib.licenses.mit; @@ -4297,7 +4338,7 @@ let name = "highlight-matching-tag"; publisher = "vincaslt"; version = "0.11.0"; - sha256 = "sha256-PxngjprSpWtD2ZDZfh+gOnZ+fVk5rvgGdZFxqbE21CY="; + hash = "sha256-PxngjprSpWtD2ZDZfh+gOnZ+fVk5rvgGdZFxqbE21CY="; }; meta = { license = lib.licenses.mit; @@ -4309,7 +4350,7 @@ let name = "intellicode-api-usage-examples"; publisher = "VisualStudioExptTeam"; version = "0.2.8"; - sha256 = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA="; + hash = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA="; }; meta = { description = "See relevant code examples from GitHub for over 100K different APIs right in your editor."; @@ -4325,7 +4366,7 @@ let name = "vscodeintellicode"; publisher = "VisualStudioExptTeam"; version = "1.2.30"; - sha256 = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE="; + hash = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE="; }; meta = { description = "AI-assisted development"; @@ -4341,7 +4382,7 @@ let name = "vscode-vlang"; publisher = "vlanguage"; version = "0.1.14"; - sha256 = "sha256-hlBALxBs5wZZFk4lgAkdkGs731Xuc2p0qxffOW6mMWQ="; + hash = "sha256-hlBALxBs5wZZFk4lgAkdkGs731Xuc2p0qxffOW6mMWQ="; }; meta = { description = "V language support (syntax highlighting, formatter, snippets) for Visual Studio Code."; @@ -4357,7 +4398,7 @@ let name = "vscode-gradle"; publisher = "vscjava"; version = "3.13.2024011802"; - sha256 = "sha256-TCYGL2GZCb1UFvJEoACPHg+DxTmDu0E8lvyNiy95bRw="; + hash = "sha256-TCYGL2GZCb1UFvJEoACPHg+DxTmDu0E8lvyNiy95bRw="; }; meta = { @@ -4375,7 +4416,7 @@ let name = "vscode-java-debug"; publisher = "vscjava"; version = "0.55.2023121302"; - sha256 = "sha256-8kwV5LsAoad+16/PAVFqF5Nh6TbrLezuRS+buh/wFFo="; + hash = "sha256-8kwV5LsAoad+16/PAVFqF5Nh6TbrLezuRS+buh/wFFo="; }; meta = { license = lib.licenses.mit; @@ -4387,7 +4428,7 @@ let name = "vscode-java-dependency"; publisher = "vscjava"; version = "0.23.2024010506"; - sha256 = "sha256-kP5NTj1gGSNRiiT6cgBLsgUhBmBEULQGm7bqebRH+/w="; + hash = "sha256-kP5NTj1gGSNRiiT6cgBLsgUhBmBEULQGm7bqebRH+/w="; }; meta = { license = lib.licenses.mit; @@ -4399,7 +4440,7 @@ let name = "vscode-java-test"; publisher = "vscjava"; version = "0.40.2024011806"; - sha256 = "sha256-ynl+94g34UdVFpl+q1XOFOLfNsz/HMOWeudL8VNG2bo="; + hash = "sha256-ynl+94g34UdVFpl+q1XOFOLfNsz/HMOWeudL8VNG2bo="; }; meta = { license = lib.licenses.mit; @@ -4411,7 +4452,7 @@ let name = "vscode-java-pack"; publisher = "vscjava"; version = "0.25.2023121402"; - sha256 = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM="; + hash = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; @@ -4427,7 +4468,7 @@ let name = "vscode-maven"; publisher = "vscjava"; version = "0.43.2024011905"; - sha256 = "sha256-75pttt0nCuZNP+1e9lmsAqLSDHdca3o+K1E5h0Y9u0I="; + hash = "sha256-75pttt0nCuZNP+1e9lmsAqLSDHdca3o+K1E5h0Y9u0I="; }; meta = { license = lib.licenses.mit; @@ -4439,7 +4480,7 @@ let name = "vscode-spring-initializr"; publisher = "vscjava"; version = "0.11.2023070103"; - sha256 = "sha256-EwUwMCaaW9vhrW3wl0Q7T25Ysm0c35ZNOkJ+mnRXA8Y="; + hash = "sha256-EwUwMCaaW9vhrW3wl0Q7T25Ysm0c35ZNOkJ+mnRXA8Y="; }; meta = { license = lib.licenses.mit; @@ -4467,7 +4508,7 @@ let name = "vim"; publisher = "vscodevim"; version = "1.26.1"; - sha256 = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI="; + hash = "sha256-zshuABicdkT52Nqj1L2RrfMziBRgO+R15fM32SCnyXI="; }; meta = { license = lib.licenses.mit; @@ -4479,7 +4520,7 @@ let name = "vspacecode"; publisher = "VSpaceCode"; version = "0.10.14"; - sha256 = "sha256-iTFwm/P2wzbNahozyLbdfokcSDHFzLrzVDHI/g2aFm0="; + hash = "sha256-iTFwm/P2wzbNahozyLbdfokcSDHFzLrzVDHI/g2aFm0="; }; meta = { license = lib.licenses.mit; @@ -4491,7 +4532,7 @@ let name = "whichkey"; publisher = "VSpaceCode"; version = "0.11.3"; - sha256 = "sha256-PnaOwOIcSo1Eff1wOtQPhoHYvrHDGTcsRy9mQfdBPX4="; + hash = "sha256-PnaOwOIcSo1Eff1wOtQPhoHYvrHDGTcsRy9mQfdBPX4="; }; meta = { license = lib.licenses.mit; @@ -4533,7 +4574,7 @@ let name = "vscode-ruby"; publisher = "wingrunr21"; version = "0.28.0"; - sha256 = "sha256-H3f1+c31x+lgCzhgTb0uLg9Bdn3pZyJGPPwfpCYrS70="; + hash = "sha256-H3f1+c31x+lgCzhgTb0uLg9Bdn3pZyJGPPwfpCYrS70="; }; meta.license = lib.licenses.mit; @@ -4556,7 +4597,7 @@ let name = "change-case"; publisher = "wmaurer"; version = "1.0.0"; - sha256 = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc="; + hash = "sha256-tN/jlG2PzuiCeERpgQvdqDoa3UgrUaM7fKHv6KFqujc="; }; meta = { description = "A VSCode extension for quickly changing the case (camelCase, CONSTANT_CASE, snake_case, etc) of the current selection or current word"; @@ -4571,7 +4612,7 @@ let name = "viml"; publisher = "xadillax"; version = "2.1.2"; - sha256 = "sha256-n91Rj1Rpp7j7gndkt0bV+jT1nRMv7+coVoSL5c7Ii3A="; + hash = "sha256-n91Rj1Rpp7j7gndkt0bV+jT1nRMv7+coVoSL5c7Ii3A="; }; meta = { license = lib.licenses.mit; @@ -4608,7 +4649,7 @@ let publisher = "yzhang"; name = "dictionary-completion"; version = "1.2.2"; - sha256 = "sha256-dpJcJARRKzRNHfXs/qknud8OQ8xIyeaVnt/EcDq0k4E="; + hash = "sha256-dpJcJARRKzRNHfXs/qknud8OQ8xIyeaVnt/EcDq0k4E="; }; meta = { description = "A Visual Studio Code extension to help user easyly finish long words "; @@ -4640,6 +4681,22 @@ let }; }; + zainchen.json = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "json"; + publisher = "ZainChen"; + version = "2.0.2"; + hash = "sha256-nC3Q8KuCtn/jg1j/NaAxWGvnKe/ykrPm2PUjfsJz8aI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ZainChen.json/changelog"; + description = "A Visual Studio Code extension for JSON support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ZainChen.json"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.rhoriguchi ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; @@ -4657,7 +4714,7 @@ let name = "riscv"; publisher = "zhwu95"; version = "0.0.8"; - sha256 = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; + hash = "sha256-PXaHSEXoN0ZboHIoDg37tZ+Gv6xFXP4wGBS3YS/53TY="; }; meta = { description = "Basic RISC-V colorization and snippets support."; @@ -4673,7 +4730,7 @@ let name = "vscode-zig"; publisher = "ziglang"; version = "0.5.1"; - sha256 = "sha256-ygxvkewK5Tf1zNIXxzu6D/tKYNVcNsU9cKij7d5aRdQ="; + hash = "sha256-ygxvkewK5Tf1zNIXxzu6D/tKYNVcNsU9cKij7d5aRdQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; @@ -4692,7 +4749,10 @@ let version = "0.5.4"; sha256 = "08dfl5h1k6s542qw5qx2czm1wb37ck9w2vpjz44kp2az352nmksb"; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; postInstall = '' cd "$out/$installPrefix" jq '.contributes.configuration.properties.protoc.properties.path.default = "${protobuf}/bin/protoc"' package.json | sponge package.json diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix index 8f2784c3704d2..f84f625779b39 100644 --- a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -7,7 +7,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "vsc-material-theme"; publisher = "Equinusocio"; version = "34.3.1"; - sha256 = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; + hash = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; }; # extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead. diff --git a/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix new file mode 100644 index 0000000000000..81b0520a53d71 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/eugleo.magic-racket/default.nix @@ -0,0 +1,32 @@ +{ + lib, + jq, + moreutils, + racket, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "magic-racket"; + publisher = "evzen-wybitul"; + version = "0.6.4"; + hash = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json + jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; + description = "The best coding experience for Racket in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; + homepage = "https://github.com/Eugleo/magic-racket"; + license = lib.licenses.agpl3Only; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix b/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix new file mode 100644 index 0000000000000..51824f34ff6e9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/foxundermoon.shell-format/default.nix @@ -0,0 +1,33 @@ +{ + jq, + lib, + moreutils, + shfmt, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shell-format"; + publisher = "foxundermoon"; + version = "7.2.5"; + hash = "sha256-kfpRByJDcGY3W9+ELBzDOUMl06D/vyPlN//wPgQhByk="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."shellformat.path".default = "${shfmt}/bin/shfmt"' package.json | sponge package.json + ''; + + meta = { + downloadPage = "https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format"; + homepage = "https://github.com/foxundermoon/vs-shell-format"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dbirks ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index 234b0880e284a..a73da886437f0 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -4,7 +4,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "terraform"; publisher = "hashicorp"; version = "2.19.0"; - sha256 = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; + hash = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY="; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix b/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix new file mode 100644 index 0000000000000..005f78f4f4ae9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/jackmacwindows.craftos-pc/default.nix @@ -0,0 +1,43 @@ +{ + vscode-utils, + craftos-pc, + jq, + lib, + moreutils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "craftos-pc"; + publisher = "jackmacwindows"; + version = "1.2.2"; + hash = "sha256-A+MNroXv0t9Mw/gr0Fyov3cXyF/GGzwRLKrIxQ2tKCE="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + + jq -e ' + .contributes.configuration.properties."craftos-pc.executablePath.linux".default = + "${lib.meta.getExe craftos-pc}" | + .contributes.configuration.properties."craftos-pc.executablePath.mac".default = + "${lib.meta.getExe craftos-pc}" | + .contributes.configuration.properties."craftos-pc.executablePath.windows".default = + "${lib.meta.getExe craftos-pc}" + ' \ + < package.json \ + | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/jackmacwindows.craftos-pc/changelog"; + description = "A Visual Studio Code extension for opening a CraftOS-PC window"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jackmacwindows.craftos-pc"; + homepage = "https://www.craftos-pc.cc/docs/extension"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomodachi94 ]; + platforms = craftos-pc.meta.platforms; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index fd1367b239689..0f11ddc5ed2cb 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -5,7 +5,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "plantuml"; publisher = "jebbs"; version = "2.17.4"; - sha256 = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; + hash = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix b/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix new file mode 100644 index 0000000000000..a3658346147e3 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/kamadorueda.alejandra/default.nix @@ -0,0 +1,38 @@ +{ + alejandra, + jq, + lib, + moreutils, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "alejandra"; + publisher = "kamadorueda"; + version = "1.0.0"; + hash = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + + jq -e ' + .contributes.configuration.properties."alejandra.program".default = + "${alejandra}/bin/alejandra" | + .contributes.configurationDefaults."alejandra.program" = + "${alejandra}/bin/alejandra" + ' \ + < package.json \ + | sponge package.json + ''; + meta = { + description = "The Uncompromising Nix Code Formatter"; + homepage = "https://github.com/kamadorueda/alejandra"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.kamadorueda ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix new file mode 100644 index 0000000000000..156e35ab06a01 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix @@ -0,0 +1,38 @@ +# 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.4"; + hash = "sha256-GwlzFphZmP87pLys01+PWTv13imcdGjunCMH6atz9xs="; + }; + + 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/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix index e871baa608efa..6c7ba096f6c58 100644 --- a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix +++ b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix @@ -1,10 +1,10 @@ -{ publisher, name, version, arch ? "", sha256 ? "" }: +{ publisher, name, version, arch ? "", sha256 ? "", hash ? "" }: let archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); in { url = "https://${publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${publisher}/extension/${name}/${version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage${archurl}"; - sha256 = sha256; + inherit sha256 hash; # The `*.vsix` file is in the end a simple zip file. Change the extension # so that existing `unzip` hooks takes care of the unpacking. name = "${publisher}-${name}.zip"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix new file mode 100644 index 0000000000000..e8f5f60ee9edc --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -0,0 +1,117 @@ +{ lib +, icu +, openssl +, patchelf +, stdenv +, vscode-utils +}: +let + inherit (stdenv.hostPlatform) system; + inherit (vscode-utils) buildVscodeMarketplaceExtension; + + extInfo = { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; + 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" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; + 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" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; + 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" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; + 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" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + }.${system} or (throw "Unsupported system: ${system}"); +in +buildVscodeMarketplaceExtension { + mktplcRef = { + name = "csdevkit"; + publisher = "ms-dotnettools"; + version = "1.4.28"; + inherit (extInfo) hash arch; + }; + sourceRoot = "extension"; # This has more than one folder. + + nativeBuildInputs = [ + patchelf + ]; + + postPatch = '' + declare ext_unique_id + ext_unique_id="$(basename "$out" | head -c 32)" + + patchelf_add_icu_as_needed() { + declare elf="''${1?}" + declare icu_major_v="${ + lib.head (lib.splitVersion (lib.getVersion icu.name)) + }" + + for icu_lib in icui18n icuuc icudata; do + patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" + done + } + + patchelf_common() { + declare elf="''${1?}" + + patchelf_add_icu_as_needed "$elf" + patchelf --add-needed "libssl.so" "$elf" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \ + "$elf" + } + + substituteInPlace dist/extension.js \ + --replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ + --replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' + + '' + + (lib.concatStringsSep "\n" (map + (bin: '' + chmod +x "${bin}" + '') + extInfo.binaries)) + + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map + (bin: '' + patchelf_common "${bin}" + '') + extInfo.binaries)); + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.csdevkit/changelog"; + description = "The official Visual Studio Code extension for C# from Microsoft"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ggg ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} 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 c1c84082e2ffc..213ce3550f45c 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"; - sha256 = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; + hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; binaries = linuxBins; }; aarch64-linux = { arch = "linux-arm64"; - sha256 = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; + hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; binaries = linuxBins; }; x86_64-darwin = { arch = "darwin-x64"; - sha256 = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; + hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; binaries = darwinBins; }; aarch64-darwin = { arch = "darwin-arm64"; - sha256 = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; + hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; binaries = darwinBins ++ [ ".debugger/arm64/vsdbg-ui" ".debugger/arm64/vsdbg" @@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension { name = "csharp"; publisher = "ms-dotnettools"; version = "2.22.3"; - inherit (extInfo) sha256 arch; + inherit (extInfo) hash arch; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 559eef612cd03..25091b95efc4b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "python"; publisher = "ms-python"; version = "2023.1.10091012"; - sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; + hash = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; }; buildInputs = [ icu ]; @@ -72,7 +72,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { tmp=$(mktemp) curl -sLo $tmp $(echo ${(import ../mktplcExtRefToFetchArgs.nix mktplcRef).url} | sed "s|${mktplcRef.version}|$version|") hash=$(nix hash file --type sha256 --base32 --sri $tmp) - sed -i -e "s|${mktplcRef.sha256}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/python/default.nix + sed -i -e "s|${mktplcRef.hash}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix fi ''; 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 new file mode 100644 index 0000000000000..c5ae57e0f63b0 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -0,0 +1,25 @@ +{ + lib, + pyright, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pylance"; + publisher = "MS-python"; + version = "2023.8.50"; + hash = "sha256-xJU/j5r/Idp/0VorEfciT4SFKRBpMCv9Z0LKO/++1Gk="; + }; + + buildInputs = [ pyright ]; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.vscode-pylance/changelog"; + description = "A performant, feature-rich language server for Python in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance"; + homepage = "https://github.com/microsoft/pylance-release"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} 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 072d91a7505df..99de6b59b1761 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -5,7 +5,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "jupyter"; publisher = "ms-toolsai"; version = "2024.2.0"; - sha256 = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw="; + hash = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 5bfe648d14c05..63e351f69b4a3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -84,7 +84,7 @@ buildVscodeMarketplaceExtension { name = "remote-ssh"; publisher = "ms-vscode-remote"; version = "0.78.0"; - sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w="; + hash = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w="; }; postPatch = '' 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 2de2c1c8789fe..bd1d6bf66e755 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -32,11 +32,11 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; supported = { x86_64-linux = { - sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; + hash = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; arch = "linux-x64"; }; aarch64-linux = { - sha256 = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM="; + hash = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM="; arch = "linux-arm64"; }; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index c1a782698c63e..0f70451c4652e 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -1,54 +1,23 @@ -# Based on previous attempts: -# - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix> -# - <https://github.com/NixOS/nixpkgs/issues/41189> -{ lib, gccStdenv, vscode-utils -, autoPatchelfHook, bash, makeWrapper -, curl, gcc, libsecret, libunwind, libX11, lttng-ust, util-linux -, desktop-file-utils, xsel -}: +{ lib, vscode-utils, xsel }: -let - # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually - libs = [ - # Credential Storage - libsecret - - # NodeJS - libX11 - - # https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170 - libunwind - lttng-ust - curl - - # General - gcc.cc.lib - util-linux # libuuid - ]; - -in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.5900"; - sha256 = "sha256-syVW/aS2ppJjg4OZaenzGM3lczt+sLy7prwsYFTDl9s="; + version = "1.0.5918"; + hash = "sha256-Tk0mKydUF8M7l7NC9wEA7t2rzJWy/mq4/HvIHI2/ldQ="; }; -}).overrideAttrs({ buildInputs ? [], ... }: { - buildInputs = buildInputs ++ libs; - # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates. - # Rather than patching the calls to functions, we modify the functions to return what we want, - # which is less likely to break in the future. postPatch = '' substituteInPlace extension.js \ - --replace "'xsel'" "'${xsel}/bin/xsel'" + --replace-fail '"xsel"' '"${xsel}/bin/xsel"' ''; meta = { - description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; + description = "Real-time collaborative development for VS Code"; homepage = "https://aka.ms/vsls-docs"; + changelog = "https://marketplace.visualstudio.com/items/MS-vsliveshare.vsliveshare/changelog"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.jraygauthier lib.maintainers.V ]; - platforms = [ "x86_64-linux" ]; + maintainers = builtins.attrValues { inherit (lib.maintainers) jraygauthier V; }; }; -}) +} diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix new file mode 100644 index 0000000000000..9dbf71b8b1016 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -0,0 +1,39 @@ +{ + jq, + lib, + moreutils, + tinymist, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tinymist"; + publisher = "myriad-dreamin"; + # Please update the corresponding binary (tinymist) when updating + # this extension. + version = "0.11.5"; + hash = "sha256-p97RREGKhTeXO5s4jP8qUsLtYxOj91ddQhsk6Q+50jc="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ tinymist ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; + description = "A VSCode extension for providing an integration solution for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; + homepage = "https://github.com/myriad-dreamin/tinymist"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix new file mode 100644 index 0000000000000..ec054521240de --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/nvarner.typst-lsp/default.nix @@ -0,0 +1,39 @@ +{ + jq, + lib, + moreutils, + typst-lsp, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "typst-lsp"; + publisher = "nvarner"; + # Please update the corresponding binary (typst-lsp) when updating + # this extension. + version = "0.12.1"; + hash = "sha256-JcfFaR1wU5XwapH8vnfVy7Cb7DfUWVeoLfBV3wEtCpE="; + }; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ typst-lsp ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog"; + description = "A VSCode extension for providing a language server for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; + homepage = "https://github.com/nvarner/typst-lsp"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; +} 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 b978430868aa8..056904390c3ea 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 @@ -26,7 +26,7 @@ let owner = "rust-lang"; repo = "rust-analyzer"; rev = releaseTag; - sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; + hash = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; }; build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix new file mode 100644 index 0000000000000..143ce42045612 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + vscode-utils, + autoPatchelfHook, + libxcrypt-legacy, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sourcery"; + publisher = "sourcery"; + version = "1.16.0"; + hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + }; + + postPatch = '' + pushd sourcery_binaries/install + rm -r win ${if stdenv.isLinux then "mac" else "linux"} + popd + ''; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = [ + stdenv.cc.cc.lib + libxcrypt-legacy + ]; + + meta = { + changelog = "https://sourcery.ai/changelog/"; + description = "A VSCode extension for Sourcery, an AI-powered code review and pair programming tool for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sourcery.sourcery"; + homepage = "https://github.com/sourcery-ai/sourcery-vscode"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index d55d8af86038e..a6a33854d3b1a 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -8,7 +8,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "lua"; publisher = "sumneko"; version = "3.7.3"; - sha256 = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM="; + hash = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM="; }; # Running chmod in runtime will lock up extension diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix new file mode 100644 index 0000000000000..469d04dbebb4b --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -0,0 +1,31 @@ +{ + jq, + lib, + moreutils, + shellcheck, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shellcheck"; + publisher = "timonwong"; + version = "0.37.1"; + sha256 = "sha256-JSS0GY76+C5xmkQ0PNjt2Nu/uTUkfiUqmPL51r64tl0="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."shellcheck.executablePath".default = "${shellcheck}/bin/shellcheck"' package.json | sponge package.json + ''; + meta = { + description = "Integrates ShellCheck into VS Code, a linter for Shell scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck"; + homepage = "https://github.com/vscode-shellcheck/vscode-shellcheck"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.raroh73 ]; + }; +} 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 c6ad1dc42bf5f..b6e47094d57a9 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -27,8 +27,14 @@ let cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; + buildInputs = lib.optionals stdenv.isDarwin [ lldb ]; + nativeBuildInputs = [ makeWrapper ]; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-llldb -lc++abi"; + }; + buildAndTestSubdir = "adapter"; buildFeatures = [ "weak-linkage" ]; @@ -39,15 +45,17 @@ let ]; postFixup = '' - mkdir -p $out/share + mkdir -p $out/share/{adapter,formatters} # codelldb expects libcodelldb.so to be in the same # directory as the executable, and can't find it in $out/lib. # To make codelldb executable as a standalone, # we put all files in $out/share, and then wrap the binary in $out/bin. - mv $out/bin/* $out/share - cp $out/lib/* $out/share - ln -s ${lldb.lib} $out/lldb - makeWrapper $out/share/codelldb $out/bin/codelldb \ + mv $out/bin/* $out/share/adapter + cp $out/lib/* $out/share/adapter + cp -r adapter/scripts $out/share/adapter + cp -t $out/share/formatters formatters/*.py + ln -s ${lldb.lib} $out/share/lldb + makeWrapper $out/share/adapter/codelldb $out/bin/codelldb \ --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" ''; @@ -87,6 +95,15 @@ let ''; }; + # debugservers on macOS require the 'com.apple.security.cs.debugger' + # entitlement which nixpkgs' lldb-server does not yet provide; see + # <https://github.com/NixOS/nixpkgs/pull/38624> for details + lldbServer = + if stdenv.isDarwin then + "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" + else + "${lldb.out}/bin/lldb-server"; + in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; @@ -105,6 +122,9 @@ in stdenv.mkDerivation { postConfigure = '' cp -r ${nodeDeps}/lib/node_modules . + '' + lib.optionalString stdenv.isDarwin '' + export HOME="$TMPDIR/home" + mkdir $HOME ''; cmakeFlags = [ @@ -125,12 +145,10 @@ in stdenv.mkDerivation { mkdir -p $ext/{adapter,formatters} mv -t $ext vsix-extracted/extension/* - cp -t $ext/adapter ${adapter}/share/* - cp -r ../adapter/scripts $ext/adapter + cp -t $ext/ -r ${adapter}/share/* wrapProgram $ext/adapter/codelldb \ - --set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server" - cp -t $ext/formatters ../formatters/*.py - ln -s ${lldb.lib} $ext/lldb + --prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \ + --set-default LLDB_DEBUGSERVER_PATH "${lldbServer}" # Mark that all components are installed. touch $ext/platform.ok diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix index 1d0adf4d864da..9c5ce50fa245a 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix @@ -6,7 +6,7 @@ let repo = "llvm-project"; # codelldb/14.x branch rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; - sha256 = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; + hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; }; in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { passthru = (oldAttrs.passthru or {}) // { diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 0eba230ad8e03..940a39a217624 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -32,6 +32,10 @@ let inherit configurePhase buildPhase dontPatchELF dontStrip; + # Some .vsix files contain other directories (e.g., `package`) that we don't use. + # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. + sourceRoot = "extension"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; @@ -74,6 +78,7 @@ let "publisher" "version" "sha256" + "hash" "arch" ]; @@ -109,6 +114,8 @@ let version = ext.version; + relativeLocation = ext.vscodeExtUniqueId; + location = { "$mid" = 1; fsPath = ext.outPath + "/share/vscode/extensions/${ext.vscodeExtUniqueId}"; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 5d7342c823cf4..3cd3faa79014b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -7,7 +7,7 @@ , isInsiders ? false # sourceExecutableName is the name of the binary in the source archive over # which we have no control and it is needed to run the insider version as -# documented in https://nixos.wiki/wiki/Visual_Studio_Code#Insiders_Build +# documented in https://wiki.nixos.org/wiki/Visual_Studio_Code#Insiders_Build # On MacOS the insider binary is still called code instead of code-insiders as # of 2023-08-06. , sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders" @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "11brsgksn3bl3px0hwa83vr22gb2k19pn8hcn7xwn6zzcgf7rsf2"; - x86_64-darwin = "1ai7jmiq37zpicc5p387nvbx5122fp7c3qh2k596jq7l7k0iyfzd"; - aarch64-linux = "0psjz56h8asgdh0m6insfysw1f6d00hifvb0rfsi8qv0wca72wb4"; - aarch64-darwin = "0jskk6dvjg290mvw8hcs4hrhy7m3ridsj5w9lxs6kn74fdvg1byb"; - armv7l-linux = "0rz26xw312s0larjvkrf8np9c0yccppadiqmj69j47vavg78274c"; + x86_64-linux = "14m9w7wkg1704apd4d46yi6zwdlbrx2rp3fry9ffk2nn6kkahwk2"; + x86_64-darwin = "1cp74wdkva1zib04wxjby0h8r1c56g893kq5ksdj38404i2c5hdk"; + aarch64-linux = "00yrdmi4c5m8r11gm7vw18qb5ddcwwg5mdk8s9ykzhmxhdrkcarm"; + aarch64-darwin = "1jjhw60jcvj5brayarg8k6avxwaa00mwdn4lrkcdzbzzh1q4knvv"; + armv7l-linux = "1jddc3fsv65mp95ybpprx8sz3mpnp6j2ghp4nflky8iawmzz183v"; }.${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.87.2"; + version = "1.88.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "863d2581ecda6849923a2118d93a088b0745d9d6"; + rev = "e170252f762678dec6ca2cc69aba1570769a5d39"; 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 = "1hdny44f93qzpm9vgx14wk1myrnsv5qcj25rqcy2jb5kspnq6813"; + sha256 = "100nhm231gzav24lz84vxwxnqkn777kfn0fkkjmdcd30kc7g7ig9"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f46c514acb764..76666b3b3c822 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 = "1jy1lsbha951z2bcnfrkgin7nms3clpa97rx7c7pdm23mnyg9073"; - x86_64-darwin = "0425cnzw1dz2k6a9p63w7vf25icf02m04ri82dp0k1kvhjfr8l37"; - aarch64-linux = "123p1glr9rc1z2lfl8g5zw7rcipg1njybscqn9qyzkpqymcsqfdy"; - aarch64-darwin = "1bl5wvbfr5k1vy6ah2i9548cn1l3nx3ng4c544zvclskmr8kf84s"; - armv7l-linux = "0nyv3yjqcrg4r2m2d63qz34g07pp8n0ndmai9pqwcf7a1m0v0sj4"; + x86_64-linux = "1n3gb12asid2qwwzf9fj974ws9n7has9l23ni8jscx9cp63l5rbl"; + x86_64-darwin = "0gkplg2c5g7964m58fmv7b70d69g4yqrax5zn1rm4rl2agxgwyff"; + aarch64-linux = "0412222l9r81f3aa3zlzrg42hzslvvck5kds7zrmpssjrd41jxfh"; + aarch64-darwin = "1iv49m646vsbcgaxydxhpjbxspz7918brdk51gmbqf258shf8rii"; + armv7l-linux = "1sblaigrxscx4l1kln1zxzm5da5lr50y1k6qb4igq6wxbdx55iay"; }.${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.87.2.24072"; + version = "1.88.1.24104"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index 74d0bc156758b..0e883a51210af 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXt ]; - configureFlags = [ "--prefix=$(out)" ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-int" + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-function-pointer-types" + ]); preInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index 679d64d6cca4b..6fa4a67dfd6bc 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "xedit"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xorg/app"; repo = "xedit"; rev = "${pname}-${version}"; - sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg="; + sha256 = "sha256-0vP+aR8QBXAqbULOLEs7QXsehk18BJ405qoelrcepwE="; }; # ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)' diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 1fceee8182ed1..1e9b887d2d6a5 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,22 +1,41 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2 -, glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver -, discord-gamesdk, libpcap, libslirp +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + makeWrapper, + freetype, + SDL2, + glib, + pcre2, + openal, + rtmidi, + fluidsynth, + jack2, + alsa-lib, + qt5, + libvncserver, + discord-gamesdk, + libpcap, + libslirp, -, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch -, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch -, enableVncRenderer ? false -, unfreeEnableDiscord ? false + enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, + enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, + enableVncRenderer ? false, + unfreeEnableDiscord ? false, + unfreeEnableRoms ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "86Box"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; - rev = "v${version}"; - hash = "sha256-JYOJFXiUTLRs6AEMYNx88PwcVw13ChQzV1ZE5OtX6Ds="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4="; }; nativeBuildInputs = [ @@ -39,47 +58,55 @@ stdenv.mkDerivation rec { libslirp qt5.qtbase qt5.qttools - ] ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optional enableVncRenderer libvncserver; + ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableVncRenderer libvncserver; - cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + cmakeFlags = + lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" ++ lib.optional enableVncRenderer "-DVNC=ON" ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" ++ lib.optional (!unfreeEnableDiscord) "-DDISCORD=OFF"; - postInstall = lib.optional stdenv.isLinux '' - install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop + postInstall = + lib.optionalString stdenv.isLinux '' + install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop - for size in 48 64 72 96 128 192 256 512; do - install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \ - $src/src/unix/assets/"$size"x"$size"/net.86box.86Box.png - done; - ''; + for size in 48 64 72 96 128 192 256 512; do + install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \ + $src/src/unix/assets/"$size"x"$size"/net.86box.86Box.png + done; + '' + + lib.optionalString unfreeEnableRoms '' + mkdir -p $out/share/86Box + ln -s ${finalAttrs.passthru.roms} $out/share/86Box/roms + ''; + + passthru = { + roms = fetchFromGitHub { + owner = "86Box"; + repo = "roms"; + rev = "v${finalAttrs.version}"; + hash = "sha256-58nNTOLund/KeDlNwzwwihjFVigs/P0K8SN07zExE2c="; + }; + }; # Some libraries are loaded dynamically, but QLibrary doesn't seem to search # the runpath, so use a wrapper instead. - postFixup = let - libPath = lib.makeLibraryPath ([ - libpcap - ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in - '' - wrapProgram $out/bin/86Box \ - "''${qtWrapperArgs[@]}" \ - --prefix ${libPathVar} : "${libPath}" - ''; - - # Do not wrap twice. - dontWrapQtApps = true; + preFixup = + let + libPath = lib.makeLibraryPath ([ libpcap ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); + libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}") + ''; meta = with lib; { description = "Emulator of x86-based machines based on PCem."; mainProgram = "86Box"; homepage = "https://86box.net/"; - license = with licenses; [ gpl2Only ] ++ optional unfreeEnableDiscord unfree; + license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; maintainers = [ maintainers.jchw ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index fa7f68c7063f9..a51982a19cd4c 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-68"; + version = "2.0-79"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-/c0rpj4s3aNJVH+AlU9R4t321OqTvJHfZQCfyzYB4m8="; + hash = "sha256-vSZLiRzOOJJMgycjI5xpgJcUAj5WCz241mAABgNuECw="; }; patches = [ diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index f81fce6a5aa8b..3f77dcd105f91 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -71,6 +72,12 @@ stdenv.mkDerivation rec { patches = [ # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 ./find-minizip-ng.patch + + # fix buidl w/ glibc-2.39 + (fetchpatch { + url = "https://github.com/dolphin-emu/dolphin/commit/3da2e15e6b95f02f66df461e87c8b896e450fdab.patch"; + hash = "sha256-+8yGF412wQUYbyEuYWd41pgOgEbhCaezexxcI5CNehc="; + }) ]; strictDeps = true; @@ -197,7 +204,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ MP2E ashkitten - xfix ivar ]; }; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index c499c69e54421..7ec2b8df3b715 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -10,6 +10,7 @@ , fluidsynth , freetype , glib +, libicns , libpcap , libpng , libslirp @@ -18,6 +19,7 @@ , makeWrapper , ncurses , pkg-config +, python3 , SDL2 , SDL2_net , testers @@ -36,12 +38,29 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; }; + # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants + # iconutil is unavailable, replace with png2icns from libicns + # Patch bad hardcoded compiler + # Don't mess with codesign, doesn't seem to work? + postPatch = '' + substituteInPlace Makefile.am \ + --replace-fail 'sips' '## sips' \ + --replace-fail 'iconutil -c icns -o contrib/macos/dosbox.icns src/dosbox.iconset' 'png2icns contrib/macos/dosbox.icns contrib/macos/dosbox-x.png' \ + --replace-fail 'g++' "$CXX" \ + --replace-fail 'codesign' '## codesign' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + patchShebangs appbundledeps.py + ''; + strictDeps = true; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libicns + python3 ]; buildInputs = [ @@ -75,9 +94,22 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; # https://github.com/joncampbell123/dosbox-x/issues/4436 + # Build optional App Bundle target, which needs at least one arch-suffixed binary + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + cp src/dosbox-x src/dosbox-x-$(uname -m) + make dosbox-x.app + ''; + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/dosbox-x \ --prefix PATH : ${lib.makeBinPath [ yad ]} + '' + # Install App Bundle, wrap regular binary into bundle's binary to get the icon working + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv dosbox-x.app $out/Applications/ + mv $out/bin/dosbox-x $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x + makeWrapper $out/Applications/dosbox-x.app/Contents/MacOS/dosbox-x $out/bin/dosbox-x ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 7e7bfd494600a..91d2b23705ad7 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , SDL2 , cmake -, copyDesktopItems , cubeb , curl , extra-cmake-modules @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - copyDesktopItems extra-cmake-modules ninja pkg-config diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index 2661fada5f79a..efe091087927d 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-eQMKaUaZ1b0oXre4Ouli4qIyNaG64KntyRGk3/YIopc="; + sha256 = "sha256-o1Xnyts2+A3ZkzVN0o8E5nGPo2c2vYltMlHF4LZMppU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix index a17a0eadfd5b9..cf2001caff32f 100644 --- a/pkgs/applications/emulators/lambda-delta/default.nix +++ b/pkgs/applications/emulators/lambda-delta/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ SDL2 ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c89"; + }; + configureFlags = [ "--without-SDL1" ]; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index e2ed7e5f9c70f..c61b1662a6c4d 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.263"; + version = "0.264"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-6MH4dMGOekiiq4yE68dIAiWWfvQvFcvqKtT/Z1SQ1aY="; + hash = "sha256-0UWMBKM//XWm8PFl60JvTLGaDBMVZFnVrbX4omy2F4I="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix deleted file mode 100644 index 816b6c1bd4d7c..0000000000000 --- a/pkgs/applications/emulators/mednafen/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, SDL2_net -, alsa-lib -, flac -, freeglut -, libGL -, libGLU -, libX11 -, libcdio -, libjack2 -, libsamplerate -, libsndfile -, pkg-config -, zlib -, libiconv -}: - -stdenv.mkDerivation rec { - pname = "mednafen"; - version = "1.29.0"; - - src = fetchurl { - url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - SDL2 - SDL2_net - flac - freeglut - libcdio - libjack2 - libsamplerate - libsndfile - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libGL - libGLU - libX11 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ]; - - hardeningDisable = [ "pic" "format" ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/doc - mv Documentation $out/share/doc/mednafen - ''; - - meta = with lib; { - homepage = "https://mednafen.github.io/"; - description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - longDescription = '' - Mednafen is a portable, utilizing OpenGL and SDL, - argument(command-line)-driven multi-system emulator. Mednafen has the - ability to remap hotkey functions and virtual system inputs to a keyboard, - a joystick, or both simultaneously. Save states are supported, as is - real-time game rewinding. Screen snapshots may be taken, in the PNG file - format, at the press of a button. Mednafen can record audiovisual movies - in the QuickTime file format, with several different lossless codecs - supported. - - The following systems are supported (refer to the emulation module - documentation for more details): - - - Apple II/II+ - - Atari Lynx - - Neo Geo Pocket (Color) - - WonderSwan - - GameBoy (Color) - - GameBoy Advance - - Nintendo Entertainment System - - Super Nintendo Entertainment System/Super Famicom - - Virtual Boy - - PC Engine/TurboGrafx 16 (CD) - - SuperGrafx - - PC-FX - - Sega Game Gear - - Sega Genesis/Megadrive - - Sega Master System - - Sega Saturn (experimental, x86_64 only) - - Sony PlayStation - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "mednafen"; - }; -} diff --git a/pkgs/applications/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix deleted file mode 100644 index 3e11ff41d48d5..0000000000000 --- a/pkgs/applications/emulators/mednafen/server.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "mednafen-server"; - version = "0.5.2"; - - src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; - sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; - }; - - postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; - - meta = with lib; { - description = "Netplay server for Mednafen"; - mainProgram = "mednafen-server"; - homepage = "https://mednafen.github.io/"; - license = licenses.gpl2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix deleted file mode 100644 index 75a25a4bec3b0..0000000000000 --- a/pkgs/applications/emulators/mednaffe/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, pkg-config -, mednafen -, gtk3 -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "mednaffe"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "AmatCoder"; - repo = "mednaffe"; - rev = version; - sha256 = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 mednafen ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH ':' "${mednafen}/bin" - ) - ''; - - meta = with lib; { - description = "GTK-based frontend for mednafen emulator"; - mainProgram = "mednaffe"; - homepage = "https://github.com/AmatCoder/mednaffe"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 0603373dfedd5..bb0499f97277d 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: { artemist benley shamilton - xfix ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix index 73cdd865d172a..ba5f1205a58bd 100644 --- a/pkgs/applications/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , cmake , pkg-config @@ -17,26 +16,17 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "punes"; - version = "0.110"; + version = "0.111"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "v${version}"; - sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds="; }; - patches = [ - # Fixes compilation on aarch64 - # Remove when version > 0.110 - (fetchpatch { - url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; - hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config @@ -73,8 +63,9 @@ stdenv.mkDerivation rec { description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; mainProgram = "punes"; homepage = "https://github.com/punesemu/puNES"; + changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog"; license = licenses.gpl2Plus; maintainers = with maintainers; [ OPNA2608 ]; platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows; }; -} +}) diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 8068730917dfe..0e86d182f3e22 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-8Y8ZYZFNK7zk0bQRiWwoQbu6q3r25bN3EvLOA3kIxdU="; + hash = "sha256-uOnFkLrLQlBbUlIFA8wrOkQdVIvO7Np7fvi+sPJPtHE="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 4ecfe4fdf063c..1be9814b5e179 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "729a29761ae491941369c66e5f4d3521f3d335b4", - "hash": "sha256-Vv/e5qa/4JjOiUC/PvuJai2VjmAQ3Xz069l1+gP7aOw=" + "rev": "20b86372b5f490394099ee0ad06e0eb3a4fd5c2e", + "hash": "sha256-jYV2eiBSLj9H2RIau8NwYLGV2SY7GqygEYTJ3YVoMNc=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-03-22" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "9bfba0eb494cd994087cc41e5204cc11484ceae0", - "hash": "sha256-NnI3Yh4vD5edI0rWbiU2XXYppzv5FvoZr52ikOcTUo4=" + "rev": "6210d0f8c262dcdaa5b76c28057cca6077f488fe", + "hash": "sha256-5qONcwTrawd6vMa7157lexFmuj9jdzSDVqt+KUvEm0I=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-03-22" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "77060aa536c81075371c79621c95772fef765868", - "hash": "sha256-IZXn3Yn1BndRCjKCzzzcWyMBFBzKAoQ732XK32FiYK4=" + "rev": "ab39d37f868ba8ff3982ce52c4ec22c162888dd7", + "hash": "sha256-Ay3wI9WToSsJNjkNFnHXTt9JUQ6nt+S9jI378E/kK8U=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-04-19" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "239d25f4c2bbb6e66d3e48502907d3d611119a22", - "hash": "sha256-8SP/SOJR/5tDkpysYTAuDPeQJCaAVgXE9CieSj1H4ZQ=" + "rev": "e41f864c0abb36aef20f8e37cd9d9a92c00a9221", + "hash": "sha256-LkkW5mQmwv89ZECssVh43ezwe4xMagUOiSz82OupISQ=" }, - "version": "unstable-2024-03-08" + "version": "unstable-2024-03-22" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "494d53b11d875a51f2de9e8fe25db038ae4c63fa", - "hash": "sha256-hLFT4m0900+2PAmVS41Z5uf3Ir2hg2pCbs2der8CG+k=" + "rev": "51b378454e34f7535f8b627de5b81d33b0fa4cb0", + "hash": "sha256-oriFvt0RCt9Bd5DjjLSxMuswfazd31isvt5OxwwNuks=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-03-22" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -226,10 +226,10 @@ "src": { "owner": "libretro", "repo": "dolphin", - "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + "rev": "89a4df725d4eb24537728f7d655cddb1add25c18", + "hash": "sha256-f9O3//EuoCSPQC7GWmf0EzAEpjoKof30kIDBCDw0dbs=" }, - "version": "unstable-2022-12-17" + "version": "unstable-2024-04-19" }, "dosbox": { "fetcher": "fetchFromGitHub", @@ -287,31 +287,31 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "30150f7f5193be76d15653ba378d68b55d684e4f", - "hash": "sha256-ZC4FyiKU+BR8Oqjv28/AE1jrCqC/mbTa/+UKvwK+SDs=" + "rev": "c821b1008e31d40b6d0464f67a3bc0b1a3da4cce", + "hash": "sha256-yZimJ1eH5Oi+6+4eMtXppj75awCrPXMiWhalsR+Bfik=" }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-04-20" }, "fceumm": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "40969671ce9e4b1a49165d836476cd71bb960131", - "hash": "sha256-wdAigh3qUzB3wmh6q/dwCHHhuyqyAmqV+NSvrzjODVM=" + "rev": "aebea8783652bc75b21b9d2dcb28cedf1fa78e8a", + "hash": "sha256-4ux8pI2d8djkwY0M+h5tlXrLGIDHnMFiFqAWKrZAsxA=" }, - "version": "unstable-2024-03-02" + "version": "unstable-2024-04-06" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "c7ee42f0ba16623cab44678a586c248d068933f7", - "hash": "sha256-TPsG82LACDys2eQk2lZj4DBB5HUSE6mWwSrpnfdv8gQ=", + "rev": "3c38fc1f16cc6518db46a5ad350e8b3738eefb48", + "hash": "sha256-NfJJcu7noefSgFlCFCgovnrb6FSzIXu3MGQHu6TCJWo=", "fetchSubmodules": true }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-04-19" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -348,20 +348,20 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "b2dadf0c4ebcc70f04245d8bc1eefc2b8d56cbe3", - "hash": "sha256-GvZO2TJM8L65/aWp3KRsA7VpAmS6Gz3e64LDcOt97qc=" + "rev": "cbda5ea9fd81d1be0220dfc690d05240655602e4", + "hash": "sha256-uLUIFDiPJ5ZSJPezZ24bDfd10AKDCHz4ATm2BBBGs9I=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-03-22" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "667158b034ce860e345b13e1ed927fea9d155b96", - "hash": "sha256-uerlejdqJO+vPDs1K7dAxImfJzWrEWlVhF/uTaQoo6E=" + "rev": "cbacea723690e88e0b11a4b1d0e5b88b1b7eb9d4", + "hash": "sha256-7qFBzATlhf89ILHsEoF+SWwD4Pwd5+08VnK5xU1EDuI=" }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-04-20" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,10 +408,10 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67", - "hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0=" + "rev": "170929e08e13fef6f5284efb0a5ec781a2af08ed", + "hash": "sha256-92p6fKN1/kl101qrNMzjOCQJJznTdbteqXpbas36S2c=" }, - "version": "unstable-2024-02-29" + "version": "unstable-2024-04-10" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "f8b0565fd3278f2efbc3e68fc929a912645e211b", - "hash": "sha256-jOQxPUTbKQH0PKJSOItEpSHaNPzMlYOJ2CUgzSLHti4=" + "rev": "bb864ca20b40908b8fbc49a350939160d6af29f6", + "hash": "sha256-3AvjOpgBh/p0p9xq4rD8xSKqZWzulw7AKUGQ1o9B2Ck=" }, - "version": "unstable-2024-03-10" + "version": "unstable-2024-04-19" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -559,10 +559,10 @@ "src": { "owner": "libretro", "repo": "nestopia", - "rev": "2cef539e0df9ae5c8e6adf830a37f5d122bf5f05", - "hash": "sha256-OKqD99kqpIoqRUOByQ4qwAczYlIGeAn0xfTZVC5jptc=" + "rev": "b99ede358b2219602443e7f414eabf81e17da244", + "hash": "sha256-iciidNkOhie3qJO8D4yB081ywfQtGGMrKBWFmBpps9g=" }, - "version": "unstable-2024-02-18" + "version": "unstable-2024-04-07" }, "np2kai": { "fetcher": "fetchFromGitHub", @@ -630,43 +630,43 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1546496fa818dc51e763c37f4f2e2456dafa4e13", - "hash": "sha256-9zAor3HxefRlRLq0ab447JUG1JsBZ4OdAbvzw3XckqE=" + "rev": "e5cb0939ab32d3c3b90b39e2d49a1652a7cf0db1", + "hash": "sha256-K96w3NGXpsnVAmORPdwwhwIJ6PcvaDOEUtLkF4ftX3s=" }, - "version": "unstable-2024-03-10" + "version": "unstable-2024-04-18" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "d907d65692a45e126d0c7d6685cc8792b52bc577", - "hash": "sha256-CJJcWVueg3dbBT4r6W1y8Qj7iRwH7PupvFp+CKEII7o=", + "rev": "ad93670449a28825d4b2cebf2eeff72cf03377a9", + "hash": "sha256-AGupXJVUkOt7XjXE1s5Y3SzZjZBAujaAAsR0CgxfKe0=", "fetchSubmodules": true }, - "version": "unstable-2024-01-23" + "version": "unstable-2024-03-26" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "65d892247c28569cc971a84d743e7bb2ec7a3dd6", - "hash": "sha256-wRX/xGnIjdTO2W9k09JWb3gMx8rFv4+9IaqCQ3qroyA=", + "rev": "57f8a1389f7f2987ab2ad99fdc846663994603ad", + "hash": "sha256-MwqLSTDL6C823grCMRYZrwjhIhbVipAR+4vF5k8UhyE=", "fetchSubmodules": true }, - "version": "unstable-2024-03-15" + "version": "unstable-2024-04-15" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "8e93f9ad71c645cb77047fe1bd75bfb925f83580", - "hash": "sha256-xwSOPea+85h+FhtBOPfAaiQ/2AiU6PLPwm0/PCYUTGU=", + "rev": "1786a4ddb097f7df1c75b55b4c4b163032614371", + "hash": "sha256-nAyGfgSfcJ4dF5oF3FHy+aqzabf9wUOiP0w+GIY1svg=", "fetchSubmodules": true }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-04-20" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -693,10 +693,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f", - "hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y=" + "rev": "4806716da70cf1f030788b43190d71aae61e2041", + "hash": "sha256-MNqk8ItSC//82HsRfXVYCH+Xd2GV8OA/2heZprx89PY=" }, - "version": "unstable-2024-02-22" + "version": "unstable-2024-04-19" }, "quicknes": { "fetcher": "fetchFromGitHub", @@ -753,10 +753,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "1e1c45be07bf5760e73414d9ed0253d6dedb8605", - "hash": "sha256-gGAsKsI5e9jU6Zo2f72TBsHWdR6Bl+3Y1Om1zsbIjqs=" + "rev": "8077396d399424de89d0a6cc15134523965658e0", + "hash": "sha256-p6apk/8bRKSM3H3hGPr/fYGsDFgMv7syVmTHV0zgmOg=" }, - "version": "unstable-2024-02-14" + "version": "unstable-2024-04-20" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -793,10 +793,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "8e8549c1c441e62c2bac0ae5a6489ba3e15412c6", - "hash": "sha256-gcIBtLpfmjPHxnixMOF/onNyIclC8sDrmgTi3zHW0Mc=" + "rev": "09be43c5060b7f23eeb413aa3d7a7021e9a6566c", + "hash": "sha256-jxvX9YAgUVe/92AbwXwgOqJmfoH7t8QxnrrGoXzjFZs=" }, - "version": "unstable-2024-03-08" + "version": "unstable-2024-04-04" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -813,10 +813,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", - "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=" + "rev": "c7fefb5bfdec2569c2528f8daa6e75b7a3de0880", + "hash": "sha256-dE8F/NXGIEMrdmBWUTzanCSlT0ddkwG8RLZFmy1XvzQ=" }, - "version": "unstable-2024-01-26" + "version": "unstable-2024-04-18" }, "tgbdual": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index e161aaa4b93b6..b70d4431c59de 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; rev = "v${version}"; - hash = "sha256-iJteyqD7hUtBxj+Y2nQZXDJVM4k+TDIKLaLP3IFDOGo="; + hash = "sha256-tIuDDueYocvRDbA8CTR5ubGI7/Up02zUENw/HaDwC0U="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index fe9669836624a..eba4a71021969 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "unstable-2024-01-02"; + version = "unstable-2024-04-18"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "923b711dc6772a168d83dc8915e9260730fcf3a1"; - hash = "sha256-Hwgga2hCJEdf/j2mU+hLGAsWdYcfuzjCycxSF37I4qk="; + rev = "912f652740986549f41967d615d9da27c325c2b9"; + hash = "sha256-HpmRnbj6CQp7+rmZY46MyT8Ga6832COm1it2z9rKUEU="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix index 9456146ad1bfd..b4e60fdcaba87 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.17.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; rev = "v${version}"; - hash = "sha256-rmbZxXxHwIPb/zVBQiWTRPLVS+DXTrsw8d6t9nTg/ng="; + hash = "sha256-eWfSqHusTri1HQUkSxY/iAceF/9PFVMC0rhLu/4W35k="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index 4717a1b0601d7..e6451f89c5c3d 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "ripes"; # Pulling unstable version as latest stable does not build against gcc-13. - version = "2.2.6-unstable-2024-03-03"; + version = "2.2.6-unstable-2024-04-02"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; - rev = "b71f0ddd5d2d346cb97b28fd3f70fef55bb9b6b7"; + rev = "027e678a44b7b9f3e81e5b6863b0d68af05fd69c"; fetchSubmodules = true; - hash = "sha256-zQrrWBHNIacRoAEIjR0dlgUTncBCiodcBeT/wbDClWg="; + hash = "sha256-u6JxXCX1BMdbHTF7EBGEnXOV+eF6rgoZZcHqB/1nVjE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/applications/emulators/ruffle/Cargo.lock index da3d1e20a3a00..2c12ec1c1ac33 100644 --- a/pkgs/applications/emulators/ruffle/Cargo.lock +++ b/pkgs/applications/emulators/ruffle/Cargo.lock @@ -20,15 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea" +checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" dependencies = [ "enumn", "serde", ] [[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" @@ -42,9 +51,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[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", "getrandom", @@ -71,14 +80,13 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[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.5.0", "libc", - "nix 0.24.3", ] [[package]] @@ -98,17 +106,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.4.2", + "bitflags 2.5.0", "cc", "cesu8", - "jni 0.21.1", + "jni", "jni-sys", "libc", "log", - "ndk 0.8.0", + "ndk", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "thiserror", ] @@ -135,9 +143,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -149,9 +157,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -183,9 +191,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "approx" @@ -198,29 +206,25 @@ dependencies = [ [[package]] name = "arboard" -version = "3.3.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" dependencies = [ "clipboard-win", - "core-graphics 0.22.3", - "image", "log", "objc", "objc-foundation", "objc_id", "parking_lot", "thiserror", - "winapi", - "wl-clipboard-rs", - "x11rb 0.12.0", + "x11rb", ] [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "arrayref" @@ -253,6 +257,36 @@ dependencies = [ ] [[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] name = "async-channel" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -265,30 +299,55 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] [[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.3.0", + "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 2.3.0", +] + +[[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.2", + "polling 3.5.0", "rustix", "slab", "tracing", @@ -297,12 +356,21 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -314,7 +382,54 @@ checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ "async-io", "blocking", - "futures-lite 2.2.0", + "futures-lite 2.3.0", +] + +[[package]] +name = "async-process" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +dependencies = [ + "async-channel 2.2.0", + "async-io", + "async-lock 3.3.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 5.2.0", + "futures-lite 2.3.0", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[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]] @@ -324,15 +439,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] -name = "atk-sys" -version = "0.18.0" +name = "async-trait" +version = "0.1.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "proc-macro2", + "quote", + "syn 2.0.53", ] [[package]] @@ -348,33 +462,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "bindgen" -version = "0.68.1" +name = "base64" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" -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", -] +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bindgen" @@ -382,18 +494,21 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools", "lazy_static", "lazycell", + "log", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.53", + "which", ] [[package]] @@ -412,12 +527,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[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" @@ -425,21 +534,15 @@ 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" dependencies = [ "serde", ] [[package]] name = "bitstream-io" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e445576659fd04a57b44cbd00aa37aaa815ebefa0aa3cb677a6b5e63d883074f" - -[[package]] -name = "bitstream-io" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" @@ -484,21 +587,21 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock", + "async-channel 2.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -522,34 +625,28 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytecount" -version = "0.6.7" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -565,24 +662,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] name = "calloop" version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "log", - "polling 3.3.2", + "polling 3.5.0", "rustix", "slab", "thiserror", @@ -611,9 +698,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -640,9 +727,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -664,16 +751,6 @@ dependencies = [ ] [[package]] -name = "cfg-expr" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -687,16 +764,16 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -707,14 +784,14 @@ checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] name = "clap" -version = "4.4.18" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -722,9 +799,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -734,31 +811,29 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -899,19 +974,6 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" @@ -919,7 +981,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -960,32 +1022,30 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.69.4", + "bindgen", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni", "js-sys", "libc", "mach2", - "ndk 0.7.0", + "ndk", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] @@ -1014,18 +1074,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1056,12 +1116,6 @@ 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 = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1094,9 +1148,9 @@ dependencies = [ [[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", @@ -1104,14 +1158,14 @@ dependencies = [ "openssl-sys", "schannel", "socket2", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.71+curl-8.6.0" +version = "0.4.72+curl-8.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b12a7ab780395666cb576203dc3ed6e01513754939a600b85196ccf5356bc5" +checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea" dependencies = [ "cc", "libc", @@ -1120,7 +1174,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1135,16 +1189,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ - "bitflags 2.4.2", - "libloading 0.8.1", + "bitflags 2.5.0", + "libloading 0.8.3", "winapi", ] [[package]] name = "darling" -version = "0.20.5" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -1152,26 +1206,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.5" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] name = "darling_macro" -version = "0.20.5" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -1315,10 +1369,10 @@ dependencies = [ ] [[package]] -name = "derive-new" -version = "0.5.9" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", @@ -1376,7 +1430,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -1385,7 +1439,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] @@ -1411,9 +1465,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a0e42e2b3d0f663e100f5c10710ffdb9748f7e7565305ecc09044d59e0fbd" +checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e" dependencies = [ "bytemuck", "serde", @@ -1421,9 +1475,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493685c2ca33e06b5ad45ae304b13bc084c395f422268bff1377633552f69ac" +checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0" dependencies = [ "accesskit", "ahash", @@ -1435,9 +1489,9 @@ dependencies = [ [[package]] name = "egui-wgpu" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094ce3408f61ead0747b506aeb9e3fa9adbd5d937096a26dfbee24387bce8b3a" +checksum = "86f2d75e1e70228e7126f828bac05f9fe0e7ea88e9660c8cebe609bb114c61d4" dependencies = [ "bytemuck", "document-features", @@ -1453,9 +1507,9 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85f8f89d6a937535e164a5bd6e31719fd7db01bc188d7b59425414b160a2ee1" +checksum = "aa4d44f8d89f70d4480545eb2346b76ea88c3022e9f4706cebc799dbe8b004a2" dependencies = [ "arboard", "egui", @@ -1469,13 +1523,13 @@ dependencies = [ [[package]] name = "egui_extras" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34bb4782902b4c314ab3bef2dd8a23c634df2e88978fa358cd2c09fb60bab172" +checksum = "3f4a6962241a76da5be5e64e41b851ee1c95fda11f76635522a3c82b119b5475" dependencies = [ "egui", "enum-map", - "image", + "image 0.24.9", "log", "mime_guess2", "serde", @@ -1483,15 +1537,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "emath" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba2475f57a416ce2a05e557f3d18e465c7aef23f3f6da2252b428eaaaaa6a65" +checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09" dependencies = [ "bytemuck", "serde", @@ -1499,9 +1553,9 @@ dependencies = [ [[package]] name = "embed-resource" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" dependencies = [ "cc", "memchr", @@ -1527,6 +1581,12 @@ dependencies = [ ] [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "enum-map" version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1544,7 +1604,28 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", +] + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", ] [[package]] @@ -1555,7 +1636,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -1576,7 +1657,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -1591,9 +1672,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -1604,9 +1685,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823734a8b7e81302a5f1a8ba041ab4ed7805a43d8dfec4dac0c72b933699bbc" +checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af" dependencies = [ "ab_glyph", "ahash", @@ -1637,13 +1718,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escape8259" @@ -1681,6 +1758,17 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event-listener-strategy" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1691,13 +1779,23 @@ dependencies = [ ] [[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] name = "exporter" version = "0.1.0" dependencies = [ "anyhow", "clap", "futures", - "image", + "image 0.25.0", "indicatif", "log", "rayon", @@ -1707,22 +1805,6 @@ dependencies = [ ] [[package]] -name = "exr" -version = "1.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" -dependencies = [ - "bit_field", - "flume 0.11.0", - "half", - "lebe", - "miniz_oxide", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1747,15 +1829,21 @@ dependencies = [ ] [[package]] -name = "fixedbitset" -version = "0.4.2" +name = "filetime" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] [[package]] name = "flash-lso" version = "0.6.0" -source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=2f976fb15b30aa4c5cb398710dc5e31a21004e57#2f976fb15b30aa4c5cb398710dc5e31a21004e57" +source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=2f770555ea49c6db49c57c1dd46c7cc686e8dacc#2f770555ea49c6db49c57c1dd46c7cc686e8dacc" dependencies = [ "cookie-factory", "enumset", @@ -1834,24 +1922,24 @@ dependencies = [ [[package]] name = "fluent-template-macros" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7592cd1f45c1afe9084ce59c62a3a7c266c125c4c2ec97e95b0563c4aa914" +checksum = "5659bd41653516a2e46d76a58e67aa4885024c78fb5d00303f0673bbd53ad781" dependencies = [ - "flume 0.10.14", + "flume", "ignore", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.53", "unic-langid", ] [[package]] name = "fluent-templates" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3ef2c2152757885365abce32ddf682746062f1b6b3c0824a29fbed6ee4d080" +checksum = "8f755e319f6f8f836b94b28c6094c414d29a17cee76e24374c7cd61f7696b3f6" dependencies = [ "arc-swap", "fluent", @@ -1859,8 +1947,8 @@ dependencies = [ "fluent-langneg", "fluent-syntax", "fluent-template-macros", - "flume 0.10.14", - "heck", + "flume", + "heck 0.4.1", "ignore", "intl-memoizer", "lazy_static", @@ -1881,19 +1969,10 @@ dependencies = [ ] [[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "spin", -] - -[[package]] name = "flv-rs" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "thiserror", ] @@ -1914,9 +1993,9 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.16.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", @@ -1928,21 +2007,12 @@ dependencies = [ [[package]] name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -1953,17 +2023,11 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" @@ -2042,9 +2106,9 @@ dependencies = [ [[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 = [ "fastrand 2.0.1", "futures-core", @@ -2061,7 +2125,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -2113,50 +2177,11 @@ checksum = "96f3c487d429eaa928334f7f2ca7b14734f1c2f4020d2b08c1f0b4d9c70e4f17" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", "synstructure", ] [[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 = "gdk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "generational-arena" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" -dependencies = [ - "cfg-if", -] - -[[package]] name = "generator" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2181,16 +2206,6 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "gethostname" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" @@ -2214,38 +2229,55 @@ 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", ] [[package]] -name = "gif" -version = "0.13.1" +name = "gilrs" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c" dependencies = [ - "color_quant", - "weezl", + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", ] [[package]] -name = "gio-sys" -version = "0.18.1" +name = "gilrs-core" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e" dependencies = [ - "glib-sys", - "gobject-sys", + "core-foundation", + "inotify", + "io-kit-sys", + "js-sys", "libc", - "system-deps", - "winapi", + "libudev-sys", + "log", + "nix", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.54.0", ] [[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] name = "gl_generator" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2257,16 +2289,6 @@ dependencies = [ ] [[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 = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2281,7 +2303,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -2337,23 +2359,12 @@ dependencies = [ ] [[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 = "gpu-alloc" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gpu-alloc-types", ] @@ -2363,7 +2374,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -2385,7 +2396,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "gpu-descriptor-types", "hashbrown 0.14.3", ] @@ -2396,33 +2407,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", + "bitflags 2.5.0", ] [[package]] name = "h263-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=16700664e2b3334f0a930f99af86011aebee14cc#16700664e2b3334f0a930f99af86011aebee14cc" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "lazy_static", "num-traits", "thiserror", @@ -2431,32 +2424,22 @@ dependencies = [ [[package]] name = "h263-rs-deblock" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=16700664e2b3334f0a930f99af86011aebee14cc#16700664e2b3334f0a930f99af86011aebee14cc" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" dependencies = [ - "itertools 0.11.0", + "itertools", "wide", ] [[package]] name = "h263-rs-yuv" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=16700664e2b3334f0a930f99af86011aebee14cc#16700664e2b3334f0a930f99af86011aebee14cc" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" dependencies = [ "bytemuck", "wide", ] [[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2481,10 +2464,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "com", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "thiserror", "widestring", "winapi", @@ -2497,10 +2480,22 @@ 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.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" [[package]] name = "hexf-parse" @@ -2519,9 +2514,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", @@ -2551,7 +2546,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2575,6 +2570,17 @@ dependencies = [ ] [[package]] +name = "id3" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +dependencies = [ + "bitflags 2.5.0", + "byteorder", + "flate2", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2600,7 +2606,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "same-file", "walkdir", "winapi-util", @@ -2608,27 +2614,34 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif 0.12.0", - "jpeg-decoder", + "num-traits", +] + +[[package]] +name = "image" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +dependencies = [ + "bytemuck", + "byteorder", "num-traits", "png", - "qoi", "tiff", ] [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2637,9 +2650,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2649,10 +2662,30 @@ dependencies = [ ] [[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +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 = "insta" -version = "1.34.0" +version = "1.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" dependencies = [ "console", "lazy_static", @@ -2690,6 +2723,16 @@ dependencies = [ ] [[package]] +name = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] name = "isahc" version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2719,15 +2762,6 @@ dependencies = [ [[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" @@ -2743,34 +2777,6 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" -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" @@ -2793,9 +2799,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] @@ -2805,16 +2811,13 @@ name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "jpegxr" -version = "0.3.0" -source = "git+https://github.com/ruffle-rs/jpegxr?branch=ruffle#d49988f40f220e3e9c90d9f3df1d4e3bc41f6ce2" +version = "0.3.1" +source = "git+https://github.com/ruffle-rs/jpegxr?branch=ruffle#688021cb0a4935295f9aa8b488ca05bb4f1e9b34" dependencies = [ - "bindgen 0.68.1", + "bindgen", "cc", "libc", "thiserror", @@ -2822,9 +2825,9 @@ dependencies = [ [[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", ] @@ -2836,7 +2839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading 0.8.3", "pkg-config", ] @@ -2859,12 +2862,6 @@ 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 = "libc" version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2906,12 +2903,12 @@ dependencies = [ [[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.4", ] [[package]] @@ -2936,7 +2933,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -2947,7 +2944,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -2965,6 +2962,16 @@ dependencies = [ ] [[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] name = "libz-sys" version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2984,22 +2991,22 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430" +checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" +checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -3026,9 +3033,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 = "loom" @@ -3045,9 +3052,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ "hashbrown 0.14.3", ] @@ -3124,6 +3131,22 @@ dependencies = [ ] [[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3158,9 +3181,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3171,10 +3194,10 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", @@ -3225,12 +3248,12 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" +checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -3249,10 +3272,10 @@ dependencies = [ name = "naga-agal" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "insta", "naga", - "num-derive 0.4.1", + "num-derive", "num-traits", ] @@ -3261,7 +3284,7 @@ name = "naga-pixelbender" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.5.0", "naga", "naga_oil", "ruffle_render", @@ -3290,29 +3313,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", - "thiserror", -] - -[[package]] -name = "ndk" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "ndk-sys", + "num_enum", "raw-window-handle 0.6.0", "thiserror", ] @@ -3325,15 +3334,6 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" @@ -3344,9 +3344,9 @@ dependencies = [ [[package]] name = "nellymoser-rs" version = "0.1.2" -source = "git+https://github.com/ruffle-rs/nellymoser?rev=4a33521c29a918950df8ae9fe07e527ac65553f5#4a33521c29a918950df8ae9fe07e527ac65553f5" +source = "git+https://github.com/ruffle-rs/nellymoser?rev=754b1184037aa9952a907107284fb73897e26adc#754b1184037aa9952a907107284fb73897e26adc" dependencies = [ - "bitstream-io 1.10.0", + "bitstream-io", "once_cell", "rustdct", ] @@ -3375,26 +3375,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", "memoffset", - "pin-utils", ] [[package]] @@ -3436,9 +3425,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] @@ -3451,41 +3440,29 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[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.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3503,32 +3480,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[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", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -3537,17 +3493,17 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[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", ] @@ -3620,24 +3576,33 @@ dependencies = [ ] [[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.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk 0.7.0", + "jni", + "ndk", "ndk-context", - "num-derive 0.3.3", + "num-derive", "num-traits", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] @@ -3656,9 +3621,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -3682,22 +3647,22 @@ dependencies = [ ] [[package]] -name = "os_info" -version = "3.7.0" +name = "ordered-stream" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" dependencies = [ - "log", - "winapi", + "futures-core", + "pin-project-lite", ] [[package]] -name = "os_pipe" -version = "1.1.5" +name = "os_info" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "6cbb46d5d01695d7a1fb8be5f0d1968bd2b2b8ba1d1b3e7062ce2a0593e57af1" dependencies = [ - "libc", + "log", "windows-sys 0.52.0", ] @@ -3717,18 +3682,6 @@ dependencies = [ ] [[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.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3770,45 +3723,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[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 = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -3836,15 +3773,15 @@ 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 = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -3871,9 +3808,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", @@ -3884,6 +3821,12 @@ dependencies = [ ] [[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[package]] name = "portable-atomic" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3933,7 +3876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -3947,16 +3890,6 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -3972,9 +3905,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3996,16 +3929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8" dependencies = [ "quote", - "syn 2.0.48", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", + "syn 2.0.53", ] [[package]] @@ -4076,9 +4000,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -4140,7 +4064,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -4155,9 +4079,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -4178,9 +4102,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regress" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5f39ba4513916c1b2657b72af6ec671f091cd637992f58d0ede5cae4e5dea0" +checksum = "d06f9a1f7cd8473611ba1a480cf35f9c5cffc2954336ba90a982fdb7e7d7f51e" dependencies = [ "hashbrown 0.14.3", "memchr", @@ -4188,13 +4112,13 @@ dependencies = [ [[package]] name = "renderdoc" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" +checksum = "ac633a08f39bf3268714799bd8c4a1a19c19c203d817d3448bb8b91c97817cf0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "float-cmp", - "libloading 0.7.4", + "libloading 0.8.3", "once_cell", "renderdoc-sys", "winapi", @@ -4203,27 +4127,27 @@ dependencies = [ [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "rfd" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d8ab342bcc5436e04d3a4c1e09e17d74958bfaddf8d5fad6f85607df0f994f" +checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" dependencies = [ + "ashpd", "block", "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", "js-sys", "log", "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.5.2", + "pollster", + "raw-window-handle 0.6.0", + "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4242,8 +4166,8 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64", - "bitflags 2.4.2", + "base64 0.21.7", + "bitflags 2.5.0", "serde", "serde_derive", ] @@ -4258,9 +4182,9 @@ checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" name = "ruffle_core" version = "0.1.0" dependencies = [ - "async-channel 2.1.1", - "bitflags 2.4.2", - "bitstream-io 2.2.0", + "async-channel 2.2.0", + "bitflags 2.5.0", + "bitstream-io", "build_playerglobal", "bytemuck", "byteorder", @@ -4279,16 +4203,16 @@ dependencies = [ "flv-rs", "fnv", "futures", - "generational-arena", "hashbrown 0.14.3", - "image", + "id3", + "image 0.25.0", "indexmap", "jpegxr", "linkme", "lzma-rs", "nellymoser-rs", "num-bigint", - "num-derive 0.4.1", + "num-derive", "num-traits", "percent-encoding", "png", @@ -4304,6 +4228,7 @@ dependencies = [ "scopeguard", "serde", "serde_json", + "slotmap", "smallvec", "swf", "symphonia", @@ -4322,8 +4247,7 @@ name = "ruffle_desktop" version = "0.1.0" dependencies = [ "anyhow", - "arboard", - "async-channel 2.1.1", + "async-channel 2.2.0", "async-io", "async-net", "bytemuck", @@ -4339,22 +4263,28 @@ dependencies = [ "fluent-templates", "fontdb", "futures", - "futures-lite 2.2.0", - "generational-arena", - "image", + "futures-lite 2.3.0", + "gilrs", + "image 0.25.0", "isahc", + "macro_rules_attribute", "os_info", "rfd", "ruffle_core", "ruffle_render", "ruffle_render_wgpu", "ruffle_video_software", + "slotmap", "sys-locale", + "tokio", + "toml_edit 0.22.9", "tracing", + "tracing-appender", "tracing-subscriber", "tracing-tracy", "unic-langid", "url", + "urlencoding", "vergen", "webbrowser", "wgpu", @@ -4373,7 +4303,7 @@ dependencies = [ name = "ruffle_input_format" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "serde", "serde_json", ] @@ -4383,7 +4313,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -4396,14 +4326,14 @@ dependencies = [ "downcast-rs", "enum-map", "flate2", - "gif 0.13.1", + "gif", "h263-rs-yuv", "indexmap", "jpeg-decoder", "lru", "lyon", "lyon_geom", - "num-derive 0.4.1", + "num-derive", "num-traits", "png", "renderdoc", @@ -4459,7 +4389,7 @@ dependencies = [ "enum-map", "fnv", "futures", - "image", + "image 0.25.0", "indexmap", "lru", "naga", @@ -4507,10 +4437,10 @@ version = "0.1.0" dependencies = [ "anyhow", "approx", - "async-channel 2.1.1", + "async-channel 2.2.0", "chrono", "futures", - "image", + "image 0.25.0", "percent-encoding", "pretty_assertions", "regex", @@ -4529,8 +4459,8 @@ dependencies = [ name = "ruffle_video" version = "0.1.0" dependencies = [ - "generational-arena", "ruffle_render", + "slotmap", "swf", "thiserror", ] @@ -4540,7 +4470,6 @@ name = "ruffle_video_software" version = "0.1.0" dependencies = [ "flate2", - "generational-arena", "h263-rs", "h263-rs-deblock", "log", @@ -4549,6 +4478,7 @@ dependencies = [ "nihav_duck", "ruffle_render", "ruffle_video", + "slotmap", "swf", "thiserror", ] @@ -4557,13 +4487,12 @@ dependencies = [ name = "ruffle_web" version = "0.1.0" dependencies = [ - "async-channel 2.1.1", - "base64", + "async-channel 2.2.0", + "base64 0.22.0", "chrono", "console_error_panic_hook", "futures", "futures-util", - "generational-arena", "getrandom", "gloo-net", "js-sys", @@ -4577,6 +4506,7 @@ dependencies = [ "ruffle_web_common", "serde", "serde-wasm-bindgen", + "slotmap", "thiserror", "tracing", "tracing-log", @@ -4611,6 +4541,12 @@ name = "ruffle_wstr" version = "0.1.0" [[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" @@ -4655,7 +4591,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -4670,9 +4606,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe_arch" @@ -4743,27 +4679,27 @@ checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132" +checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" dependencies = [ "js-sys", "serde", @@ -4784,20 +4720,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "indexmap", "itoa", @@ -4806,6 +4742,17 @@ dependencies = [ ] [[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "serde_spanned" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4815,6 +4762,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 = "sha2" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4841,6 +4799,15 @@ 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 = "simd-adler32" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4895,17 +4862,17 @@ 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 = "smithay-client-toolkit" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -4926,9 +4893,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb62b280ce5a5cba847669933a0948d00904cf83845c944eae96a4738cea1a6" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" dependencies = [ "libc", "smithay-client-toolkit", @@ -4960,7 +4927,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -4968,12 +4935,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4991,7 +4958,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", ] [[package]] @@ -5007,12 +4974,6 @@ 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" @@ -5026,9 +4987,9 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "stub-report" @@ -5043,8 +5004,8 @@ dependencies = [ name = "swf" version = "0.2.0" dependencies = [ - "bitflags 2.4.2", - "bitstream-io 2.2.0", + "bitflags 2.5.0", + "bitstream-io", "byteorder", "encoding_rs", "enum-map", @@ -5052,16 +5013,16 @@ dependencies = [ "libflate", "log", "lzma-rs", - "num-derive 0.4.1", + "num-derive", "num-traits", "simple_asn1", ] [[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", @@ -5071,11 +5032,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", @@ -5084,9 +5044,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", @@ -5097,9 +5057,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", @@ -5120,9 +5080,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -5137,7 +5097,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -5150,33 +5110,13 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" - -[[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 2.0.1", - "redox_syscall 0.4.1", "rustix", "windows-sys 0.52.0", ] @@ -5197,7 +5137,7 @@ dependencies = [ "anyhow", "env_logger", "futures", - "image", + "image 0.25.0", "libtest-mimic", "ruffle_core", "ruffle_render_wgpu", @@ -5209,29 +5149,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[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", @@ -5340,15 +5280,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "pin-project-lite", + "tokio-macros", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "toml" -version = "0.8.9" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.1", + "toml_edit 0.22.9", ] [[package]] @@ -5362,26 +5324,26 @@ dependencies = [ [[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.21.1" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -5397,6 +5359,18 @@ dependencies = [ ] [[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] name = "tracing-attributes" version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5404,7 +5378,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] @@ -5500,29 +5474,15 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", ] [[package]] -name = "tree_magic_mini" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" -dependencies = [ - "bytecount", - "fnv", - "lazy_static", - "nom", - "once_cell", - "petgraph", -] - -[[package]] name = "ttf-parser" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5553,6 +5513,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", + "tempfile", + "winapi", +] + +[[package]] name = "unic-char-property" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5612,7 +5583,7 @@ checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.48", + "syn 2.0.53", "unic-langid-impl", ] @@ -5668,18 +5639,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-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" @@ -5702,15 +5673,28 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + +[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5723,6 +5707,12 @@ 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 = "vergen" version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5737,12 +5727,6 @@ dependencies = [ ] [[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" @@ -5750,9 +5734,12 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vfs" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4fe92cfc1bad19c19925d5eee4b30584dbbdee4ff10183b261acccbef74e2d" +checksum = "654cd097e182a71dbf899178e6b5662c2157dd0b8afd5975de18008f6fc173d1" +dependencies = [ + "filetime", +] [[package]] name = "vswhom" @@ -5782,9 +5769,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[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", @@ -5798,9 +5785,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[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", @@ -5808,24 +5795,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.53", "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", @@ -5835,9 +5822,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", @@ -5845,22 +5832,22 @@ 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.53", "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" @@ -5895,7 +5882,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "rustix", "wayland-backend", "wayland-scanner", @@ -5907,7 +5894,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cursor-icon", "wayland-backend", ] @@ -5929,7 +5916,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5941,7 +5928,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5954,7 +5941,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5992,9 +5979,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[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", @@ -6012,13 +5999,13 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" dependencies = [ "core-foundation", "home", - "jni 0.21.1", + "jni", "log", "ndk-context", "objc", @@ -6035,9 +6022,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" dependencies = [ "arrayvec", "cfg-if", @@ -6061,13 +6048,13 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" +checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg_aliases", "codespan-reporting", "indexmap", @@ -6089,15 +6076,15 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" +checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.4.2", + "bitflags 2.5.0", "block", "cfg_aliases", "core-graphics-types", @@ -6111,10 +6098,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "log", "metal", "naga", + "ndk-sys", "objc", "once_cell", "parking_lot", @@ -6133,11 +6121,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" +checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "js-sys", "serde", "web-sys", @@ -6197,15 +6185,6 @@ dependencies = [ ] [[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6213,30 +6192,31 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core", - "windows-targets 0.52.0", + "windows-core 0.54.0", + "windows-targets 0.52.4", ] [[package]] @@ -6245,7 +6225,26 @@ 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.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]] @@ -6272,7 +6271,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.4", ] [[package]] @@ -6307,17 +6306,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 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.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]] @@ -6334,9 +6333,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -6352,9 +6351,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -6370,9 +6369,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -6388,9 +6387,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -6406,9 +6405,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -6424,9 +6423,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -6442,33 +6441,33 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" -version = "0.29.10" +version = "0.29.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "calloop", "cfg_aliases", "core-foundation", - "core-graphics 0.23.1", + "core-graphics", "cursor-icon", "icrate", "js-sys", "libc", "log", "memmap2", - "ndk 0.8.0", - "ndk-sys 0.5.0+25.2.9519653", + "ndk", + "ndk-sys", "objc2", "once_cell", "orbclient", @@ -6490,24 +6489,33 @@ dependencies = [ "web-time", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.0", + "x11rb", "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.5.37" +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 = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6523,26 +6531,6 @@ dependencies = [ ] [[package]] -name = "wl-clipboard-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa" -dependencies = [ - "derive-new", - "libc", - "log", - "nix 0.26.4", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - -[[package]] name = "x11-dl" version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6555,39 +6543,17 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "gethostname 0.3.0", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.12.0", -] - -[[package]] -name = "x11rb" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", - "libloading 0.8.1", + "libloading 0.8.3", "once_cell", "rustix", - "x11rb-protocol 0.13.0", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", + "x11rb-protocol", ] [[package]] @@ -6603,12 +6569,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "xkbcommon-dl" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "dlib", "log", "once_cell", @@ -6643,6 +6619,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] +name = "zbus" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock 3.3.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "derivative", + "enumflags2", + "event-listener 5.2.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] name = "zerocopy" version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6659,14 +6699,43 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.53", ] [[package]] -name = "zune-inflate" -version = "0.2.54" +name = "zvariant" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" dependencies = [ - "simd-adler32", + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 7dfd170bd74fc..0f5501508afb1 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -9,6 +9,7 @@ , wayland , xorg , vulkan-loader +, udev , jre_minimal , cairo , gtk3 @@ -20,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2024-02-09"; + version = "nightly-2024-03-25"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - hash = "sha256-C4wfR5io0FBFmNfYHlE/v81jQAb0SEoaCzI6tenRYGg="; + hash = "sha256-3G5xSGdMl4ISQmb2BVGdKz1cXU5Mnl+VkVYpJ6P12og="; }; nativeBuildInputs = [ @@ -52,6 +53,7 @@ rustPlatform.buildRustPackage rec { xorg.libxcb xorg.libXrender vulkan-loader + udev ]; dontWrapGApps = true; @@ -59,7 +61,8 @@ rustPlatform.buildRustPackage rec { preFixup = '' patchelf $out/bin/ruffle_desktop \ --add-needed libxkbcommon-x11.so \ - --add-rpath ${libxkbcommon}/lib + --add-needed libwayland-client.so \ + --add-rpath ${libxkbcommon}/lib:${wayland}/lib ''; postFixup = '' @@ -83,10 +86,10 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "flash-lso-0.6.0" = "sha256-SHWIOVp3MGIATKDKAGNWG3B3jX3a0jDE2c8bt7NptrE="; - "h263-rs-0.1.0" = "sha256-Akf1SBjo8qikhiHI8NPvO3vJvVfm0dQBf2X9V7OdgQc="; - "jpegxr-0.3.0" = "sha256-jirUbse2MiUDCmwBO7ykWNKHgDgL/6ZM5o2HeDUhm0c="; - "nellymoser-rs-0.1.2" = "sha256-GykDQc1XwySOqfxW/OcSxkKCFJyVmwSLy/CEBcwcZJs="; + "flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo="; + "h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ="; + "jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA="; + "nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04="; "nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c="; }; }; diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix index 7433d2128a71b..09d0136c6d88a 100644 --- a/pkgs/applications/emulators/sameboy/default.nix +++ b/pkgs/applications/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "sha256-KEbwug/cwGLS/uhY1rKasLJWaKtiYYzdZvbAU2orfbI="; + sha256 = "sha256-sQWmuF1dQgvW9WyOxgxaupTUcde3KzzYiGv+v1N5ssk="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix index 34c2f72c7dd4a..8f374b7e18183 100644 --- a/pkgs/applications/emulators/snes9x/default.nix +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable // { url = "https://github.com/snes9xgit/snes9x/blob/${version}/LICENSE"; }; - maintainers = with maintainers; [ qknight xfix thiagokokada ]; + maintainers = with maintainers; [ qknight thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); mainProgram = "snes9x"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index fb9b387a7b7ae..8efe9c7ab8227 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.4"; + version = "9.6"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-xV/5lXYSVJuMfffN3HnXoA0ZFX0Fs3EUi/CNTd92jsY="; + hash = "sha256-Dglg7YK2AX6ILtozOLrRJwoRd7bPBfA6wfqxVavoIEg="; 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-wij0CeAL6V8dH4nRS+UVKZMBJlSNgzr9tG1860WSbrU="; + hash = "sha256-6AKN/KpmsTw9qxErhTTzqWuglgFdOAhtaoBlVRcs71Q="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix deleted file mode 100644 index 43fbd7e5f73b9..0000000000000 --- a/pkgs/applications/emulators/xemu/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_image -, copyDesktopItems -, gettext -, glib -, gtk3 -, libGLU -, libdrm -, libepoxy -, libpcap -, libsamplerate -, libslirp -, makeDesktopItem -, mesa -, meson -, ninja -, openssl -, perl -, pkg-config -, python3 -, vte -, which -, wrapGAppsHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xemu"; - version = "0.7.119"; - - src = fetchFromGitHub { - owner = "xemu-project"; - repo = "xemu"; - rev = "v${finalAttrs.version}"; - hash = "sha256-5gH1pQqy45vmgeW61peEi6+ZXpPgyQMUg3dh37oqR6s="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - copyDesktopItems - meson - ninja - perl - pkg-config - python3 - python3.pkgs.pyyaml - which - wrapGAppsHook - ]; - - buildInputs = [ - SDL2 - SDL2_image - gettext - glib - gtk3 - libGLU - libdrm - libepoxy - libpcap - libsamplerate - libslirp - mesa - openssl - vte - ]; - - separateDebugInfo = true; - - dontUseMesonConfigure = true; - - setOutputFlags = false; - - configureFlags = [ - "--disable-strip" - "--meson=meson" - "--target-list=i386-softmmu" - "--disable-werror" - ]; - - buildFlags = [ "qemu-system-i386" ]; - - desktopItems = [ - (makeDesktopItem { - name = "xemu"; - desktopName = "xemu"; - exec = "xemu"; - icon = "xemu"; - }) - ]; - - preConfigure = '' - patchShebangs . - configureFlagsArray+=("--extra-cflags=-DXBOX=1 -Wno-error=redundant-decls") - substituteInPlace ./scripts/xemu-version.sh \ - --replace 'date -u' "date -d @$SOURCE_DATE_EPOCH '+%Y-%m-%d %H:%M:%S'" - # When the data below can't be obtained through git, the build process tries - # to run `XEMU_COMMIT=$(cat XEMU_COMMIT)` (and similar) - echo '${finalAttrs.version}' > XEMU_VERSION - ''; - - preBuild = '' - cd build - substituteInPlace ./build.ninja --replace /usr/bin/env $(which env) - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 -T qemu-system-i386 $out/bin/xemu - '' + - # Generate code to install the icons - (lib.concatMapStringsSep ";\n" - (res: - "install -Dm644 -T ../ui/icons/xemu_${res}.png $out/share/icons/hicolor/${res}/apps/xemu.png") - [ "16x16" "24x24" "32x32" "48x48" "128x128" "256x256" "512x512" ]) + - '' - - runHook postInstall - ''; - - meta = { - homepage = "https://xemu.app/"; - description = "Original Xbox emulator"; - longDescription = '' - A free and open-source application that emulates the original Microsoft - Xbox game console, enabling people to play their original Xbox games on - Windows, macOS, and Linux systems. - ''; - changelog = "https://github.com/xemu-project/xemu/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; - platforms = lib.platforms.linux; - mainProgram = "xemu"; - }; -}) diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index 72e363b8b3c24..026c6f52d0207 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -1,22 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, libcap, acl, file, readline, python3 }: +{ + stdenv, + lib, + fetchFromGitHub, + libcap, + acl, + file, + readline, + python3, +}: stdenv.mkDerivation rec { pname = "clifm"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-plJ2iKloRGtBSa1upSo675bMj6qczR6TQ043UQboxQE="; + hash = "sha256-tgCGZCLCWcF7ktXqDHjoUkeVqxg6QVOkZb7pbk3nA+U="; }; - buildInputs = [ libcap acl file readline python3]; + buildInputs = [ + libcap + acl + file + readline + python3 + ]; makeFlags = [ - "DESTDIR=${placeholder "out"}" - "DATADIR=/share" - "PREFIX=/" + "PREFIX=${placeholder "out"}" + "DATADIR=${placeholder "out"}/share" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index ec7e47f896c63..fe0d596f4122d 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -15,11 +15,11 @@ mkDerivation rec { pname = "krusader"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-jkzwWpMYsLwbCUGBG5iLLyuwwEoNHjeZghKpGQzywpo="; + hash = "sha256-N78gRRnQqxukCWSvAnQbwijxHpfyjExRjKBdNY3xgoM="; }; patches = [ diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 1f2b8b908928a..20f91b9518a90 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lf"; - version = "31"; + version = "32"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-Tuk/4R/gGtSY+4M/+OhQCbhXftZGoxZ0SeLIwYjTLA4="; + hash = "sha256-rFK1M15NcshVY2vtXcMWZhB9Rd/DRC8JyKE5u4wjh2I="; }; - vendorHash = "sha256-PVvHrXfMN6ZSWqd5GJ08VaeKaHrFsz6FKdDoe0tk2BE="; + vendorHash = "sha256-r1Kq6CYGNbxTTue3sb3CKMsWZJDzX2dKX7QHQ73nZ8g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/file-managers/tuifimanager/default.nix b/pkgs/applications/file-managers/tuifimanager/default.nix deleted file mode 100644 index 75c65aaa13138..0000000000000 --- a/pkgs/applications/file-managers/tuifimanager/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tuifi-manager"; - version = "3.3.5"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "GiorgosXou"; - repo = "TUIFIManager"; - rev = "refs/tags/v.${version}"; - hash = "sha256-O4cAHFurgF6QzpeAMoipX2/JywU1drZOTw/Ob9Pa8WQ="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "Send2Trash == 1.8.0" "Send2Trash >= 1.8.0" - ''; - - nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.setuptools-scm - ]; - - propagatedBuildInputs = with python3.pkgs; [ - send2trash - unicurses - ]; - pythonImportsCheck = [ "TUIFIManager" ]; - - meta = with lib; { - description = "A cross-platform terminal-based termux-oriented file manager"; - longDescription = '' - A cross-platform terminal-based termux-oriented file manager (and component), - meant to be used with a Uni-Curses project or as is. This project is mainly an - attempt to get more attention to the Uni-Curses project. - ''; - homepage = "https://github.com/GiorgosXou/TUIFIManager"; - changelog = "https://github.com/GiorgosXou/TUIFIManager/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ michaelBelsanti ]; - mainProgram = "tuifi"; - }; -} diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 6ced017dff6cd..b693aee613f74 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { pname = "irpf"; - version = "2023-1.5"; + version = "2024-1.0"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { year = lib.head (lib.splitVersion version); in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - hash = "sha256-L1X+xysQSJ43TO8NSdO+T4aalampd4REL+5Uv33kYUI="; + hash = "sha256-x47Ud/aSfPuZYMZSGhJLnNFtNE62I+WjaFFatJPMPYg="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch deleted file mode 100644 index 5553f80fbc5b0..0000000000000 --- a/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 "${PYQT5_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 -@@ -206,7 +206,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 7e93c6814c7b9..3476816b1c230 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,17 +1,17 @@ { lib -, callPackage , fetchFromGitHub -, fetchpatch , makeWrapper , mkDerivation , substituteAll , wrapGAppsHook +, wrapQtAppsHook , withGrass ? true , withWebKit ? false , bison , cmake +, draco , exiv2 , fcgi , flex @@ -25,7 +25,7 @@ , netcdf , ninja , openssl -# , pdal +, pdal , postgresql , proj , protobuf @@ -36,6 +36,7 @@ , qtbase , qtkeychain , qtlocation +, qtmultimedia , qtsensors , qtserialport , qtwebkit @@ -63,8 +64,8 @@ let owslib psycopg2 pygments - pyqt-builder pyqt5 + pyqt-builder python-dateutil pytz pyyaml @@ -76,14 +77,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.28.15"; + version = "3.34.6"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-R6p1MVeCMbaD74Eqn+OLQkTYP+00y9mBucJR1JXPEJ4="; + hash = "sha256-eWd8oIINWVN5Dt6s4bc1RtQbytFd0foPgIcd/N2hsMw="; }; passthru = { @@ -94,6 +95,7 @@ in mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook + wrapQtAppsHook bison cmake @@ -102,32 +104,34 @@ in mkDerivation rec { ]; buildInputs = [ - openssl - proj - geos - sqlite - gsl - qwt + draco exiv2 - protobuf fcgi + geos + gsl + hdf5 libspatialindex libspatialite - postgresql - txt2tags libzip - hdf5 netcdf - qtbase - qtsensors + openssl + pdal + postgresql + proj + protobuf qca-qt5 - qtkeychain qscintilla + qt3d + qtbase + qtkeychain qtlocation + qtmultimedia + qtsensors qtserialport qtxmlpatterns - qt3d - # pdal + qwt + sqlite + txt2tags zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit @@ -135,22 +139,22 @@ in mkDerivation rec { patches = [ (substituteAll { - src = ./set-pyqt-package-dirs-ltr.patch; + src = ./set-pyqt-package-dirs.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) - (fetchpatch { - name = "qgis-3.28.9-exiv2-0.28.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-mPRo0A7ko4GCHJrfJ2Ls0dUKvkFtDmhKekI2CR9StMw="; - }) ]; - # PDAL is disabled until https://github.com/qgis/QGIS/pull/54940 - # is backported. + # Add path to Qt platform plugins + # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") + preBuild = '' + export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms + ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" - "-DWITH_PDAL=False" # TODO: re-enable PDAL + "-DWITH_PDAL=True" "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let @@ -159,6 +163,10 @@ in mkDerivation rec { in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" ); + qtWrapperArgs = [ + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + ]; + dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 04c02c8c0d789..d112ed50a0d52 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -78,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.36.0"; + version = "3.36.2"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uO9Bu+7n8xzsjumbp0t/yYQNvyDgRH1bdfqpX9oLoTY="; + hash = "sha256-/8mpzl/6UpjrMVjae2nqpS2DBRCq86rE+B3INzoRz8g="; }; passthru = { diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index 8510918d4cabc..264445336cd3d 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -13,7 +13,7 @@ let hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; }; }; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); meta = with lib; { description = "User-friendly Desktop Internet GIS"; diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix index 18bc00983828a..36d200ad07c46 100644 --- a/pkgs/applications/graphics/artem/default.nix +++ b/pkgs/applications/graphics/artem/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "artem"; - version = "2.0.6"; + version = "3.0.0"; src = fetchFromGitHub { owner = "finefindus"; repo = "artem"; rev = "v${version}"; - hash = "sha256-iio0MJG0qVndhQvF2zgZ6Jw0za6bBQYFmtk1Mbxpq1E="; + hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U="; }; - cargoHash = "sha256-47HNoAA1qr39qQqfq+qZoCFyjKHu5pnRKC2QzA60K3k="; + cargoHash = "sha256-QyFUxnq4BSULgpZxCu5+7TWfu6Gey0JFkOYSK+rL7l0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 1ad3476e80910..e78b95c363b6e 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -2,6 +2,8 @@ , stdenv , mkDerivation , fetchFromGitHub +, makeDesktopItem +, copyDesktopItems , cmake , boost , cgal @@ -23,13 +25,13 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.13"; + version = "2.13.1"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - hash = "sha256-tCmIdajizaTT1tvPA7YQoklfz7pYVKS0lJXrxV2fidg="; + hash = "sha256-QQwQt63tXxJnGaBLu+GvWkEazumYPhXnDe+giSu7wjk="; fetchSubmodules = true; }; @@ -37,6 +39,7 @@ mkDerivation rec { cmake eigen # header-only wrapGAppsHook + copyDesktopItems ]; buildInputs = [ @@ -96,12 +99,15 @@ mkDerivation rec { dontWrapGApps = true; postInstall = '' - install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.png -t $out/share/icons/hicolor/256x256/apps - install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/{ccViewer,cloudcompare}.desktop \ - --replace 'Exec=cloudcompare.' 'Exec=' \ - --replace 'Icon=''${SNAP}/meta/gui/' 'Icon=' \ - --replace '.png' "" + install -Dm444 $src/qCC/images/icon/cc_icon_16.png $out/share/icons/hicolor/16x16/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_32.png $out/share/icons/hicolor/32x32/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_64.png $out/share/icons/hicolor/64x64/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_256.png $out/share/icons/hicolor/256x256/apps/CloudCompare.png + + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_16.png $out/share/icons/hicolor/16x16/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_32.png $out/share/icons/hicolor/32x32/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_64.png $out/share/icons/hicolor/64x64/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_256.png $out/share/icons/hicolor/256x256/apps/ccViewer.png ''; # fix file dialogs crashing on non-NixOS (and avoid double wrapping) @@ -109,11 +115,35 @@ mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + desktopItems = [ + (makeDesktopItem { + name = "CloudCompare"; + desktopName = "CloudCompare"; + comment = "3D point cloud and mesh processing software"; + exec = "CloudCompare"; + terminal = false; + categories = [ "Graphics" "3DGraphics" "Viewer" ]; + keywords = [ "3d" "processing" ]; + icon = "CloudCompare"; + }) + (makeDesktopItem { + name = "ccViewer"; + desktopName = "CloudCompare Viewer"; + comment = "3D point cloud and mesh processing software"; + exec = "ccViewer"; + terminal = false; + categories = [ "Graphics" "3DGraphics" "Viewer" ]; + keywords = [ "3d" "viewer" ]; + icon = "ccViewer"; + }) + ]; + meta = with lib; { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; + mainProgram = "CloudCompare"; platforms = with platforms; linux; # only tested here; might work on others }; } diff --git a/pkgs/applications/graphics/conjure/default.nix b/pkgs/applications/graphics/conjure/default.nix index 634cf7132b1d5..105b8577bd64e 100644 --- a/pkgs/applications/graphics/conjure/default.nix +++ b/pkgs/applications/graphics/conjure/default.nix @@ -3,7 +3,7 @@ , lib , libadwaita , python3Packages -, wrapGAppsHook +, wrapGAppsHook4 , meson , ninja , desktop-file-utils @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils appstream-glib meson diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 2a881c153f682..d12c3e6f22614 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils , gettext @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook4 appstream-glib desktop-file-utils gettext diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix deleted file mode 100644 index 0eef148398cb7..0000000000000 --- a/pkgs/applications/graphics/displaycal/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, python3 -, fetchPypi -, wrapGAppsHook -, gtk3 -, librsvg -, xorg -, argyllcms -}: - -python3.pkgs.buildPythonApplication rec { - pname = "displaycal"; - version = "3.9.11"; - format = "setuptools"; - - src = fetchPypi { - pname = "DisplayCAL"; - inherit version; - hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; - }; - - nativeBuildInputs = [ - wrapGAppsHook - gtk3 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - build - certifi - wxpython - dbus-python - distro - numpy - pillow - pychromecast - send2trash - zeroconf - ]; - - buildInputs = [ - gtk3 - librsvg - ] ++ (with xorg; [ - libX11 - libXxf86vm - libXext - libXinerama - libXrandr - ]); - - # Workaround for eoyilmaz/displaycal-py3#261 - setupPyGlobalFlags = [ "appdata" ]; - - doCheck = false; # Tests try to access an X11 session and dbus in weird locations. - - pythonImportsCheck = [ "DisplayCAL" ]; - - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - ''${gappsWrapperArgs[@]} - --prefix PATH : ${lib.makeBinPath [ argyllcms ]} - --prefix PYTHONPATH : $PYTHONPATH - ) - ''; - - meta = with lib; { - description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)"; - homepage = "https://github.com/eoyilmaz/displaycal-py3"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ toastal ]; - }; -} diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 20f061c50e040..b53879974d00d 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -4,8 +4,9 @@ , fetchYarnDeps , makeDesktopItem , copyDesktopItems -, prefetch-yarn-deps +, fixup-yarn-lock , makeWrapper +, autoSignDarwinBinariesHook , nodejs , yarn , electron @@ -13,28 +14,35 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.0.4"; + version = "24.1.0"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+TCnVXcmAEpa7MiL0dyeoh2aUfIIO8eze9pEaHgKnME="; + hash = "sha256-vwytqlPv8LfOceuBs/MNPxzO1ZYv1hwjIRyBh/wuVEU="; }; + # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead + postPatch = '' + sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.js + ''; + offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg="; + hash = "sha256-mRnGsfxrdfzk6+z07174zZ7pcS68Zut6inuBPZkLtWQ="; }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock makeWrapper nodejs yarn ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems + ] ++ lib.optionals stdenv.isDarwin [ + autoSignDarwinBinariesHook ]; ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index f970b7ffc58ff..323920ff4deb9 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -37,16 +37,16 @@ let in rustPlatform.buildRustPackage rec { pname = "emulsion"; - version = "10.4"; + version = "10.5"; src = fetchFromGitHub { owner = "ArturKovacs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9M9FyDehony5+1UwtEk7bRjBAlV4GvhtABi0MpjYcIA="; + sha256 = "sha256-Wrb5jHr2rXDpXF/uHpNLKSc//Xdj0/VsXQcytit0hKY="; }; - cargoHash = "sha256-fcZCFD4XBHFIhwZtpYLkv8oDe+TmhvUEKFY3iJAMdFI="; + cargoHash = "sha256-zfR4sp/AmK3+UcFdqMMZE9O9+oGathqmuqFw11SmUWI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 12076557acfb7..3b45ca987f1a2 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "2.3.0"; + version = "2.4.0"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; + hash = "sha256-mqkPegbGos38S50CoV4Qse9Z4wZ327UmIwmSrrP35uI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/flaca/Cargo.lock b/pkgs/applications/graphics/flaca/Cargo.lock deleted file mode 100644 index fe91f0890a47e..0000000000000 --- a/pkgs/applications/graphics/flaca/Cargo.lock +++ /dev/null @@ -1,729 +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 = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", -] - -[[package]] -name = "argyle" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7b00c835644c00c2f160668103439b2e4374e9340fda8a9730e2efa8925145" - -[[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 = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ctrlc" -version = "3.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" -dependencies = [ - "nix", - "windows-sys", -] - -[[package]] -name = "dactyl" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f762271c6826d426c3fd2e37aa827fa039596bc7050e9289cb713265be3d7f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "dowser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea8b43a90f6c54a58a97ad6a82001227bafeeb4550ee05732fb656133494918" -dependencies = [ - "ahash", - "dactyl", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "flaca" -version = "2.3.0" -dependencies = [ - "argyle", - "cc", - "ctrlc", - "dactyl", - "dowser", - "fyi_msg", - "libc", - "mozjpeg-sys", - "oxipng", - "rayon", - "write_atomic", -] - -[[package]] -name = "flate2" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "fyi_msg" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bb9530916893c31bca029d18088c77f02ea93e270cffab771f9b985cdeb4bb" -dependencies = [ - "ahash", - "bytecount", - "dactyl", - "term_size", - "unicode-width", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[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.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "libdeflate-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6784b6b84b67d71b4307963d456a9c7c29f9b47c658f533e598de369e34277" -dependencies = [ - "cc", -] - -[[package]] -name = "libdeflater" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e285aa6a046fd338b2592c16bee148b2b00789138ed6b7bb56bb13d585050d" -dependencies = [ - "libdeflate-sys", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[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 = "mozjpeg-sys" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808feab72499ffd6c267a6fd06bd07e37bef14650c328a5c64636fecfa113eff" -dependencies = [ - "cc", - "dunce", - "libc", - "nasm-rs", -] - -[[package]] -name = "nasm-rs" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4d98d0065f4b1daf164b3eafb11974c94662e5e2396cf03f32d0bb5c17da51" -dependencies = [ - "rayon", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - -[[package]] -name = "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 = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oxipng" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630638e107fb436644c300e781d3f17e1b04656138ba0d40564be4be3b06db32" -dependencies = [ - "bitvec", - "crossbeam-channel", - "image", - "indexmap", - "itertools", - "libdeflater", - "log", - "rgb", - "rustc-hash", - "rustc_version", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[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 = "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 = "rgb" -version = "0.8.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" -dependencies = [ - "bytemuck", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys", -] - -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.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 = "write_atomic" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cc5bd3df909eefc4f13328da8ac3b9e6016e0899477c0354c6880c67362cfc" -dependencies = [ - "rustix", - "tempfile", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] diff --git a/pkgs/applications/graphics/flaca/default.nix b/pkgs/applications/graphics/flaca/default.nix index 912887e0e93a9..90fec04b36e5f 100644 --- a/pkgs/applications/graphics/flaca/default.nix +++ b/pkgs/applications/graphics/flaca/default.nix @@ -1,21 +1,35 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, fetchFromGitHub +, rustPlatform +, fetchurl +, runCommand +, lndir +}: rustPlatform.buildRustPackage rec { pname = "flaca"; - version = "2.3.0"; + version = "2.4.6"; - src = fetchFromGitHub { - owner = "Blobfolio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-gK9nKvhrqGQ3yDAfnqDF2K1g6JK3CYz0kSpTLqfGTzc="; - }; + src = + let + source = fetchFromGitHub { + owner = "Blobfolio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-uybEo098+Y92b2P9CniKFmaV8hQZFuOSthgQRGZ/ncc="; + }; + lockFile = fetchurl { + url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock"; + hash = "sha256-xAjpw71HgS6fILg5zNuc43s0fIqYcoUMMbCH65xrlww="; + }; + in + runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } '' + mkdir -p $out + ln -s ${lockFile} $out/Cargo.lock + lndir -silent ${source} $out + ''; - # upstream does not provide a Cargo.lock - cargoLock.lockFile = ./Cargo.lock; - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; + cargoHash = "sha256-w+PeuH6VFIu3iH5EXF6gEwyYoGeqXX0yd5jJs2NqisQ="; meta = with lib; { description = "A CLI tool to losslessly compress JPEG and PNG images"; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index a064e27a66577..c88e068615bef 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,36 +2,27 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp +, gphoto2, imagemagick, yad, exiftool, gnome, libnotify , wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.1"; + version = "2.4"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-qkM/7auZ9TMF2r8KLnitxmvlyPmIjh7q9Ugh+QKh8hw="; + hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g="; }; patches = [ + # Remove changelog from menu (fetchpatch { - name = "exiv2-0.28.0-support-1.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/c45cca777aa3477eaf297db99f337e18d9683c61.patch"; - hash = "sha256-YiFzAj3G3Z2w7p+8zZlDBjWqUqnfSqvaxMkESfPFdzc="; - }) - (fetchpatch { - name = "exiv2-0.28.0-support-2.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/b04f7cd0546976dc4f7ea440648ac0eedd8df3ce.patch"; - hash = "sha256-V0ZOHbAZOrhLcNN+Al1/kvxvbw0vc/R7r99CegjuBQg="; - }) - (fetchpatch { - name = "fix-compilation-with-lua.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/a132645ee87e612217ac955b227cad04f21a5722.patch"; - hash = "sha256-BozarBPoIKxZS3qpjuzHHAWZGIWZAwvJyqsNC8v+TMk="; + url = "https://salsa.debian.org/debian/geeqie/-/raw/debian/master/debian/patches/Remove-changelog-from-menu-item.patch"; + hash = "sha256-0awKKTLg/gUZhmwluVbHCOqssog9SneFOaUtG89q0go="; }) ]; @@ -54,8 +45,29 @@ stdenv.mkDerivation rec { postInstall = '' # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. + # Requires exiftran (fbida package) and exiv2. sed -i $out/lib/geeqie/geeqie-rotate \ -e '1 a export PATH=${lib.makeBinPath [ exiv2 fbida ]}:$PATH' + # Zenity and yad are used in some scripts for reporting errors. + # Allow change quality of image. + # Requires imagemagick and yad. + sed -i $out/lib/geeqie/geeqie-resize-image \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick yad ]}:$PATH' + # Allow to crop image. + # Requires imagemagick, exiv2 and exiftool. + sed -i $out/lib/geeqie/geeqie-image-crop \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + # Requires gphoto2 and libnotify + sed -i $out/lib/geeqie/geeqie-tethered-photography \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + # Import images from camera. + # Requires gphoto2. + sed -i $out/lib/geeqie/geeqie-camera-import \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + # Export jpeg from raw file. + # Requires exiv2, exiftool and lcms2. + sed -i $out/lib/geeqie/geeqie-export-jpeg \ + -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 16d5ab6d33c1a..b628cf8166311 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { config, lib, pkgs }: let - inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub fetchFromGitLab; + inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab; in lib.makeScope pkgs.newScope (self: @@ -123,6 +123,23 @@ in nativeBuildInputs = with pkgs; [autoreconfHook]; + postUnpack = '' + tar -xf $sourceRoot/extern_libs/ffmpeg.tar.gz -C $sourceRoot/extern_libs + ''; + + postPatch = let + ffmpegPatch = fetchpatch2 { + name = "fix-ffmpeg-binutil-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY="; + }; + in '' + patch -Np1 -i ${ffmpegPatch} -d extern_libs/ffmpeg + ffmpegSrc=$(realpath extern_libs/ffmpeg) + ''; + + configureFlags = ["--with-ffmpegsrcdir=${placeholder "ffmpegSrc"}"]; + hardeningDisable = [ "format" ]; env = { diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix deleted file mode 100644 index b715093308fab..0000000000000 --- a/pkgs/applications/graphics/graphicsmagick/compat.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, graphicsmagick }: - -stdenv.mkDerivation { - pname = "graphicsmagick-imagemagick-compat"; - inherit (graphicsmagick) version; - - dontUnpack = true; - buildPhase = "true"; - - utils = [ - "composite" - "conjure" - "convert" - "identify" - "mogrify" - "montage" - "animate" - "display" - "import" - ]; - - # TODO: symlink libraries? - installPhase = '' - mkdir -p "$out"/bin - mkdir -p "$out"/share/man/man1 - for util in ''${utils[@]}; do - ln -s ${graphicsmagick}/bin/gm "$out/bin/$util" - ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz" - done - ''; - - meta = { - description = "ImageMagick interface for GraphicsMagick"; - license = lib.licenses.free; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix deleted file mode 100644 index 893d2cebb6010..0000000000000 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript -, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences -, coreutils -, runCommand -, graphicsmagick # for passthru.tests -}: - -stdenv.mkDerivation rec { - pname = "graphicsmagick"; - version = "1.3.42"; - - src = fetchurl { - url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "sha256-SE/M/Ssvr2wrqRUUaezlByvLkbpO1z517T2ORsdZ1Vc="; - }; - - patches = [ - ./disable-popen.patch - ]; - - configureFlags = [ - # specify delegates explicitly otherwise `gm` will invoke the build - # coreutils for filetypes it doesn't natively support. - "MVDelegate=${lib.getExe' coreutils "mv"}" - "--enable-shared" - "--with-frozenpaths" - "--with-quantum-depth=${toString quantumdepth}" - "--with-gslib=yes" - ]; - - buildInputs = - [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 - zlib libtool libwebp - ]; - - nativeBuildInputs = [ xz nukeReferences ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - # Remove CFLAGS from the binaries to avoid closure bloat. - # In the past we have had -dev packages in the closure of the binaries soley due to the string references. - postConfigure = '' - nuke-refs -e $out ./magick/magick_config.h - ''; - - postInstall = '' - sed -i 's/-ltiff.*'\'/\'/ $out/bin/* - ''; - - passthru = { - tests = { - issue-157920 = runCommand "issue-157920-regression-test" { - buildInputs = [ graphicsmagick ]; - } '' - gm convert ${graphviz}/share/doc/graphviz/neatoguide.pdf jpg:$out - ''; - }; - }; - - meta = { - homepage = "http://www.graphicsmagick.org"; - description = "Swiss army knife of image processing"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - mainProgram = "gm"; - }; -} diff --git a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch b/pkgs/applications/graphics/graphicsmagick/disable-popen.patch deleted file mode 100644 index 2cdb1f7e90f72..0000000000000 --- a/pkgs/applications/graphics/graphicsmagick/disable-popen.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://permalink.gmane.org/gmane.comp.security.oss.general/19669 - ---- a/magick/blob.c Sat Nov 07 14:49:16 2015 -0600 -+++ b/magick/blob.c Sun May 29 14:12:57 2016 -0500 -@@ -68,6 +68,7 @@ - */ - #define DefaultBlobQuantum 65541 - -+#undef HAVE_POPEN - - /* - Enum declarations. diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index bbf52e105a284..d7ebb0a747ea3 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -2,7 +2,7 @@ # libs librsvg, sane-backends, sane-frontends, # runtime dependencies - imagemagick, libtiff_4_5, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, + imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies xvfb-run, liberation_ttf, file, tesseract }: @@ -82,7 +82,7 @@ perlPackages.buildPerlPackage rec { wrapProgram "$out/bin/gscan2pdf" \ --prefix PATH : "${sane-backends}/bin" \ --prefix PATH : "${imagemagick}/bin" \ - --prefix PATH : "${libtiff_4_5}/bin" \ + --prefix PATH : "${libtiff}/bin" \ --prefix PATH : "${djvulibre}/bin" \ --prefix PATH : "${poppler_utils}/bin" \ --prefix PATH : "${ghostscript}/bin" \ @@ -98,10 +98,7 @@ perlPackages.buildPerlPackage rec { nativeCheckInputs = [ imagemagick - # Needs older libtiff version, because it stopped packageing tools like - # tiff2pdf and others in version 4.6. These tools are necessary for gscan2pdf. - # See commit f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a for in-depth explanation. - libtiff_4_5 + libtiff djvulibre poppler_utils ghostscript diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index dc077e63e302c..b3b9deedffa21 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.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; - rev = "v${version}"; - sha256 = "sha256-Ha9PTvr6XNGhe4I0ZUwrdbsNHWhz+Ubw2gp+ctLTO64="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; }; # needed for wrapGAppsHook to function diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index d2ce6c57cec21..79326a6a700f6 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "hello-wayland"; - version = "unstable-2023-10-26"; + version = "0-unstable-2024-03-04"; src = fetchFromGitHub { owner = "emersion"; repo = "hello-wayland"; - rev = "b631afa4f6fd86560ccbdb8c7b6fe42851c06a57"; - sha256 = "MaBzGZ05uCoeeiglFYHC40hQlPvtDw5sQhqXgtVDySc="; + rev = "5f3a35def81116f0a74fcaf5a421d66c6700482d"; + hash = "sha256-gcLR8gosQlPPgFrxqmRQ6/59RjAfJNX6CcsYP+L+A58="; }; separateDebugInfo = true; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 9d9b22c1cb74f..d546baa98415f 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "564"; + version = "566"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-U2Z04bFrSJBCk6RwLcKr/x+Pia9V5UHjpUi8AzaCf9o="; + hash = "sha256-0vz2UnfU7yZIy1S+KOXLFrlQDuPCbpSw1GYEK8YZ/Qc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 0fa08c31c0a68..72d9d9cc1e01b 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , cmake , fetchFromGitHub , wrapQtAppsHook @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; license = licenses.asl20; homepage = "https://bionus.github.io/imgbrd-grabber/"; + mainProgram = "Grabber"; maintainers = [ maintainers.evanjs ]; }; } diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index d694752134391..22bce94e11ab4 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.38.1"; + version = "1.39.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-eVNW8Iuhee9WBbiXP7ijvd0K44/IpwdrdiT4RkBNcxI="; + hash = "sha256-bAk+F81q0sPSgU8LkpniVJyKaQt6cxUaUzNSZ3f5v0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 9416a4708e4c0..8df637ffa1ce1 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchpatch, makeWrapper, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, fetchpatch, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons @@ -13,7 +13,7 @@ }: mkDerivation rec { - pname = "krita"; + pname = "krita-unwrapped"; inherit version; src = fetchurl { @@ -36,7 +36,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons @@ -72,14 +72,11 @@ mkDerivation rec { "-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON" ]; - preInstall = '' - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - meta = with lib; { description = "A free and open source painting application"; homepage = "https://krita.org/"; maintainers = with maintainers; [ abbradar sifmelcara nek0 ]; + mainProgram = "krita"; platforms = platforms.linux; license = licenses.gpl3Only; }; diff --git a/pkgs/applications/graphics/krita/wrapper.nix b/pkgs/applications/graphics/krita/wrapper.nix new file mode 100644 index 0000000000000..6d62412e5662c --- /dev/null +++ b/pkgs/applications/graphics/krita/wrapper.nix @@ -0,0 +1,27 @@ +{ lib +, libsForQt5 +, symlinkJoin +, unwrapped ? libsForQt5.callPackage ./. { } +, krita-plugin-gmic +, binaryPlugins ? [ + # Default plugins provided by upstream appimage + krita-plugin-gmic + ] +}: + +symlinkJoin { + name = lib.replaceStrings [ "-unwrapped" ] [ "" ] unwrapped.name; + inherit (unwrapped) version buildInputs nativeBuildInputs meta; + + paths = [ unwrapped ] ++ binaryPlugins; + + postBuild = '' + wrapQtApp "$out/bin/krita" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --set KRITA_PLUGIN_PATH "$out/lib/kritaplugins" + ''; + + passthru = { + inherit unwrapped binaryPlugins; + }; +} diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index cd2a1f4b51845..e9ca6b52a0410 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.5.04"; + version = "1.5.06"; 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-cyQUv/KqdtDwCFo8CatJYdepgdWNwTSMyDLzOjvvO5c="; + sha256 = "sha256-VJMfvZHqdgUQXLyBBZLEV3nyP0qzibuXLnZyBhBBg9E="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 32d5288315395..a77a39445c045 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -15,21 +15,27 @@ , qhull , cmake , cgal -, boost179 +, boost , mpfr , xercesc +, tbb +, embree +, vcg +, libigl +, corto +, openctm +, structuresynth }: mkDerivation rec { pname = "meshlab"; - version = "2022.02"; + version = "2023.12"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "MeshLab-${version}"; - sha256 = "sha256-jcc3PfsiIeYyipteZgzd0NwZgFFgR/mMBiaInzhOcDY="; - fetchSubmodules = true; # for vcglib + sha256 = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y="; }; buildInputs = [ @@ -46,38 +52,38 @@ mkDerivation rec { levmar qhull cgal - boost179 + boost mpfr xercesc + tbb + embree + vcg + libigl + corto + openctm + structuresynth ]; nativeBuildInputs = [ cmake ]; preConfigure = '' - substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop - cmakeDir=$PWD/src - mkdir ../build - cd ../build + substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop + substituteInPlace src/external/libigl.cmake \ + --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl} + substituteInPlace src/external/nexus.cmake \ + --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src} + substituteInPlace src/external/levmar.cmake \ + --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \ + --replace-warn "MD5 ''${LEVMAR_MD5}" "" + substituteInPlace src/external/ssynth.cmake \ + --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ + --replace-warn "MD5 ''${SSYNTH_MD5}" "" + substituteInPlace src/common_gui/CMakeLists.txt \ + --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR" ''; cmakeFlags = [ - "-DALLOW_BUNDLED_EIGEN=OFF" - "-DALLOW_BUNDLED_GLEW=OFF" - "-DALLOW_BUNDLED_LIB3DS=OFF" - "-DALLOW_BUNDLED_MUPARSER=OFF" - "-DALLOW_BUNDLED_QHULL=OFF" - # disable when available in nixpkgs - "-DALLOW_BUNDLED_OPENCTM=ON" - "-DALLOW_BUNDLED_SSYNTH=ON" - "-DALLOW_BUNDLED_BOOST=OFF" - # some plugins are disabled unless these are on - "-DALLOW_BUNDLED_NEWUOA=ON" - "-DALLOW_BUNDLED_LEVMAR=ON" - ]; - - CXXFLAGS = [ - # GCC 13: error: 'int16_t' has not been declared in 'std' - "-include cstdint" + "-DVCGDIR=${vcg.src}" ]; postFixup = '' diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 68ebaa5f9dcd1..a79b112780504 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -2,28 +2,22 @@ , stdenv , fetchFromGitLab , writeText -, cmake -, cjson -, doxygen -, glslang -, pkg-config -, python3 -, SDL2 , bluez +, cjson +, cmake , dbus +, doxygen , eigen , elfutils , ffmpeg +, glslang , gst-plugins-base , gstreamer , hidapi -, libGL -, libXau -, libXdmcp -, libXrandr -, libXext , libbsd +, libdrm , libffi +, libGL , libjpeg , librealsense , libsurvive @@ -32,13 +26,20 @@ , libuv , libuvc , libv4l +, libXau , libxcb +, libXdmcp +, libXext +, libXrandr , onnxruntime , opencv4 , openhmd , openvr , orc , pcre2 +, pkg-config +, python3 +, SDL2 , shaderc , udev , vulkan-headers @@ -46,7 +47,6 @@ , wayland , wayland-protocols , wayland-scanner -, libdrm , zlib , zstd , nixosTests @@ -83,7 +83,6 @@ stdenv.mkDerivation { ]; buildInputs = [ - SDL2 bluez cjson dbus @@ -93,13 +92,11 @@ stdenv.mkDerivation { gst-plugins-base gstreamer hidapi - libGL - libXau - libXdmcp - libXrandr libbsd - libjpeg + libdrm libffi + libGL + libjpeg librealsense libsurvive libunwind @@ -107,21 +104,25 @@ stdenv.mkDerivation { libuv libuvc libv4l + libXau libxcb + libXdmcp + libXext + libXrandr onnxruntime opencv4 openhmd openvr orc pcre2 + SDL2 shaderc udev vulkan-headers vulkan-loader wayland - wayland-scanner wayland-protocols - libdrm + wayland-scanner zlib zstd ]; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index f83184a488aa6..d7e322f39588d 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.16"; + version = "0.8.18"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA="; + hash = "sha256-TLY6ydYeRuT93jjUeE7EaFNNllwla4h563UhXAxSyko="; }; - cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww="; + cargoHash = "sha256-RKJE09Z4XxRLWQ95Om3tru4rI2TD7XmxoHhPHFirREo="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 1214d868d5c8f..1dd460c2e1d2b 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,12 +1,93 @@ -{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, opencv, pkg-config, qtbase -, qtmultimedia, qtscript, qtserialport, lib, stdenv, superlu, wrapQtAppsHook, }: -let source = import ./source.nix { inherit fetchFromGitHub; }; -in stdenv.mkDerivation rec { - inherit (source) src; +{ boost +, cmake +, fetchFromGitHub +, freeglut +, freetype +, glew +, libjpeg +, libmypaint +, libpng +, libusb1 +, lz4 +, xz +, lzo +, openblas +, opencv +, pkg-config +, qtbase +, qtmultimedia +, qtscript +, qtserialport +, lib +, stdenv +, superlu +, wrapQtAppsHook +, libtiff +, zlib +}: +let + libtiff-ver = "4.0.3"; # The version in thirdparty/tiff-* + opentoonz-ver = "1.7.1"; + + src = fetchFromGitHub { + owner = "opentoonz"; + repo = "opentoonz"; + rev = "v${opentoonz-ver}"; + hash = "sha256-5iXOvh4QTv+G0fjEHU62u7QCee+jbvKhK0+fQXbdJis="; + }; + + opentoonz-opencv = opencv.override { + inherit libtiff; + }; + + opentoonz-libtiff = stdenv.mkDerivation { + pname = "libtiff"; + version = "${libtiff-ver}-opentoonz"; + + inherit src; + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ zlib libjpeg xz ]; + + postUnpack = '' + sourceRoot="$sourceRoot/thirdparty/tiff-${libtiff-ver}" + ''; + + # opentoonz uses internal libtiff headers + postInstall = '' + cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include + ''; + + meta = libtiff.meta // { + knownVulnerabilities = [ + '' + Do not open untrusted files with Opentoonz: + Opentoonz uses an old custom fork of tibtiff from 2012 that is known to + be affected by at least these 50 vulnerabilities: + CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 + CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 + CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 + CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 + CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 + CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 + CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 + CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 + CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 + CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 + CVE-2020-35523 CVE-2020-35524 + More info at https://github.com/opentoonz/opentoonz/issues/4193 + '' + ]; + maintainers = with lib.maintainers; [ chkno ]; + }; + }; +in +stdenv.mkDerivation { + inherit src; pname = "opentoonz"; - version = source.versions.opentoonz; + version = opentoonz-ver; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; @@ -18,13 +99,13 @@ in stdenv.mkDerivation rec { libjpeg libmypaint libpng - libtiff + opentoonz-libtiff libusb1 lz4 xz lzo openblas - opencv + opentoonz-opencv qtbase qtmultimedia qtscript @@ -37,8 +118,9 @@ in stdenv.mkDerivation rec { cmakeDir = "../sources"; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" - "-DTIFF_INCLUDE_DIR=${libtiff.dev}/include" - "-DTIFF_LIBRARY=${libtiff.out}/lib/libtiff.so" + "-DTIFF_INCLUDE_DIR=${opentoonz-libtiff.dev}/include" + "-DTIFF_LIBRARY=${opentoonz-libtiff.out}/lib/libtiff.so" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ]; postInstall = '' diff --git a/pkgs/applications/graphics/opentoonz/libtiff.nix b/pkgs/applications/graphics/opentoonz/libtiff.nix deleted file mode 100644 index 43ba1592ccc2d..0000000000000 --- a/pkgs/applications/graphics/opentoonz/libtiff.nix +++ /dev/null @@ -1,56 +0,0 @@ -# Per https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md , -# opentoonz requires its own modified version of libtiff. We still build it as -# a separate package -# 1. For visibility for tools like vulnix, and -# 2. To avoid a diamond-dependency problem with opencv linking the normal libtiff -# and opentoonz linking opencv and this modified libtiff, we build an opencv -# against this modified libtiff as well. -# -# We use a separate mkDerivation rather than a minimal libtiff.overrideAttrs -# because the main libtiff builds with cmake and this version of libtiff was -# forked before libtiff gained CMake build capability (added in libtiff-4.0.5). - -{ lib, fetchFromGitHub, stdenv, pkg-config, zlib, libjpeg, xz, libtiff, }: - -let source = import ./source.nix { inherit fetchFromGitHub; }; - -in stdenv.mkDerivation { - pname = "libtiff"; - version = source.versions.libtiff + "-opentoonz"; - - inherit (source) src; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ zlib libjpeg xz ]; - - postUnpack = '' - sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" - ''; - - # opentoonz uses internal libtiff headers - postInstall = '' - cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include - ''; - - meta = libtiff.meta // { - knownVulnerabilities = ['' - Do not open untrusted files with Opentoonz: - Opentoonz uses an old custom fork of tibtiff from 2012 that is known to - be affected by at least these 50 vulnerabilities: - CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 - CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 - CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 - CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 - CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 - CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 - CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 - CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 - CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 - CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 - CVE-2020-35523 CVE-2020-35524 - More info at https://github.com/opentoonz/opentoonz/issues/4193 - '']; - maintainers = with lib.maintainers; [ chkno ]; - }; -} diff --git a/pkgs/applications/graphics/opentoonz/source.nix b/pkgs/applications/graphics/opentoonz/source.nix deleted file mode 100644 index 2864dcf36088a..0000000000000 --- a/pkgs/applications/graphics/opentoonz/source.nix +++ /dev/null @@ -1,16 +0,0 @@ -# opentoonz's source archive contains both opentoonz's source and a modified -# version of libtiff that opentoonz requires. - -{ fetchFromGitHub, }: rec { - versions = { - opentoonz = "1.7.1"; - libtiff = "4.0.3"; # The version in thirdparty/tiff-* - }; - - src = fetchFromGitHub { - owner = "opentoonz"; - repo = "opentoonz"; - rev = "v${versions.opentoonz}"; - hash = "sha256-5iXOvh4QTv+G0fjEHU62u7QCee+jbvKhK0+fQXbdJis="; - }; -} diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index ccc95ac942168..5be47fb1b85a5 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-B0ZubvWIEZFnD2v74bpPv+/wr7vaHS9QP4//9/afjzQ="; + hash = "sha256-dCaNF5UoH6SkKBrZGtwg2qZcDtlptdBxEGZL2oKyjhI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 5868705275086..c65353143368f 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -42,7 +42,7 @@ clangStdenv.mkDerivation rec { mainProgram = "PikoPixel"; homepage = "https://twilightedge.com/mac/pikopixel/"; downloadPage = "https://twilightedge.com/mac/pikopixel/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index cb7e1310a0663..86e85e0efad2f 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-UZVpyrUFf/uJNs2GHLYXpb81e7yzC8EFuoD+0Bzj6xQ="; + hash = "sha256-aiQlcTID8mfrT4MEx4s5K+QmMHBlHOu2HfsValiH5qU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/potreeconverter/default.nix b/pkgs/applications/graphics/potreeconverter/default.nix index cc63cbe289b60..ae7acec3522f4 100644 --- a/pkgs/applications/graphics/potreeconverter/default.nix +++ b/pkgs/applications/graphics/potreeconverter/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cmake ]; - patchPhase = '' + postPatch = '' runHook prePatch substituteInPlace ./CMakeLists.txt \ @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { # prevent inheriting permissions from /nix/store when copying substituteInPlace Converter/src/main.cpp --replace \ 'fs::copy(templateDir, pagedir, fs::copy_options::overwrite_existing | fs::copy_options::recursive)' 'string cmd = "cp --no-preserve=mode -r " + templateDir + " " + pagedir; system(cmd.c_str());' - - runHook postPatch ''; + # The upstream build system does not provide an install target. installPhase = '' runHook preInstall + mkdir -p $out/{bin,lib} mv liblaszip.so $out/lib mv PotreeConverter $out/bin @@ -56,10 +56,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; - fixupPhase = '' - runHook preFixup + postFixup = '' ln -s $src/resources $out/bin/resources - runHook postFixup ''; meta = with lib; { diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix index 5a0774a09f430..825ea4c51e190 100644 --- a/pkgs/applications/graphics/pureref/default.nix +++ b/pkgs/applications/graphics/pureref/default.nix @@ -1,14 +1,16 @@ -{ lib, appimageTools, requireFile }: +{ lib, appimageTools, runCommand, curl, gnugrep, cacert }: appimageTools.wrapType1 rec { pname = "pureref"; version = "1.11.1"; - src = requireFile { - name = "PureRef-${version}_x64.Appimage"; - sha256 = "05naywdgykqrsgc3xybskr418cyvbx7vqs994yv9w8zf98gxvbvm"; - url = "https://www.pureref.com/download.php"; - }; + src = runCommand "PureRef-${version}_x64.Appimage" { + nativeBuildInputs = [ curl gnugrep cacert ]; + outputHash = "sha256-da/dH0ruI562JylpvE9f2zMUSJ56+T7Y0xlP/xr3yhY="; + } '' + key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" + curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out + ''; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix new file mode 100644 index 0000000000000..5bf8339797b42 --- /dev/null +++ b/pkgs/applications/graphics/pymeshlab/default.nix @@ -0,0 +1,107 @@ +{ stdenv +, lib +, fetchFromGitHub +, libGLU +, qtbase +, qtscript +, qtxmlpatterns +, lib3ds +, bzip2 +, muparser +, eigen +, glew +, gmp +, levmar +, qhull +, cmake +, cgal +, boost +, mpfr +, xercesc +, tbb +, embree +, vcg +, libigl +, corto +, openctm +, structuresynth +, wrapQtAppsHook +, python3Packages +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pymeshlab"; + version = "2023.12"; + + src = fetchFromGitHub { + owner = "cnr-isti-vclab"; + repo = "pymeshlab"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg="; + fetchSubmodules = true; + }; + + buildInputs = [ + libGLU + qtbase + qtscript + qtxmlpatterns + lib3ds + bzip2 + muparser + eigen + glew + gmp + levmar + qhull + cgal + boost + mpfr + xercesc + tbb + embree + vcg + libigl + corto + structuresynth + openctm + ]; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + python3Packages.pybind11 + ]; + + propagatedBuildInputs = [ + python3Packages.numpy + ]; + + preConfigure = '' + substituteInPlace src/meshlab/src/external/libigl.cmake \ + --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl} + substituteInPlace src/meshlab/src/external/nexus.cmake \ + --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src} + substituteInPlace src/meshlab/src/external/levmar.cmake \ + --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \ + --replace-warn "MD5 ''${LEVMAR_MD5}" "" + substituteInPlace src/meshlab/src/external/ssynth.cmake \ + --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ + --replace-warn "MD5 ''${SSYNTH_MD5}" "" + export cmakeFlags="cmakeFlags + -DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab + " + ''; + + cmakeFlags = [ + "-DVCGDIR=${vcg.src}" + ]; + + meta = { + description = "The open source mesh processing python library"; + homepage = "https://github.com/cnr-isti-vclab/PyMeshLab"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = with lib.platforms; linux; + }; +}) diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index 07c7748de2648..0cbd1de820423 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -51,7 +51,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", ] @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "approx" @@ -178,17 +178,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ "async-lock 3.3.0", "async-task", @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -261,19 +261,21 @@ dependencies = [ [[package]] name = "async-process" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" dependencies = [ "async-channel", "async-io", "async-lock 3.3.0", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 5.2.0", + "event-listener 5.3.0", "futures-lite", "rustix", + "tracing", "windows-sys 0.52.0", ] @@ -320,9 +322,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "autocxx" @@ -356,7 +358,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.52", + "syn 2.0.58", "which", ] @@ -369,7 +371,7 @@ dependencies = [ "autocxx-engine", "env_logger", "indexmap 1.9.3", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -396,7 +398,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 2.0.52", + "syn 2.0.58", "tempfile", "thiserror", "version_check", @@ -412,7 +414,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -429,15 +431,15 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.52", + "syn 2.0.58", "thiserror", ] [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -459,9 +461,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "bindgen" @@ -469,7 +471,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -480,7 +482,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -497,9 +499,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 = "block" @@ -531,9 +533,9 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -543,9 +545,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" [[package]] name = "cairo-rs" @@ -553,7 +555,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -620,9 +622,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -645,9 +647,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.2" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -662,19 +664,19 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -864,14 +866,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "cxx" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad" +checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a" dependencies = [ "cc", "cxxbridge-flags", @@ -881,31 +883,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.119" +version = "0.7.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5797d553b95704a6a49394acfdb93e2332b8aaa146713a1e8ebe362e86d9fa68" +checksum = "cf9e305d914e15a8eefd7972a3b658d876d91a22681d555219feda30a9f5ea2b" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "cxxbridge-flags" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5" +checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287" [[package]] name = "cxxbridge-macro" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1" +checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1129,9 +1131,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1150,11 +1152,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -1188,9 +1190,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -1379,9 +1381,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 = [ "fastrand", "futures-core", @@ -1398,7 +1400,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1537,9 +1539,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" dependencies = [ "cfg-if", "libc", @@ -1584,9 +1586,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -1615,11 +1617,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1646,15 +1648,15 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1844,6 +1846,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" @@ -1961,9 +1969,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2105,9 +2113,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 = "jni" @@ -2180,18 +2188,19 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", ] [[package]] name = "kurbo" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" dependencies = [ "arrayvec", "smallvec", @@ -2277,9 +2286,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librsvg" -version = "2.58.0-beta.1" +version = "2.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d441368ddd551d54ef8ebcf515cf8a22604856a66da21828fa1d57651a9f71" +checksum = "de005d9589235493d0e2b62d055c0d8e368db4fb33e746dafc9400fb67b9c817" dependencies = [ "cairo-rs", "cast", @@ -2420,9 +2429,9 @@ dependencies = [ [[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 = "memmap2" @@ -2435,9 +2444,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2471,7 +2480,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2513,9 +2522,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.4" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" +checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" dependencies = [ "approx", "matrixmultiply", @@ -2545,7 +2554,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", "ndk-sys", @@ -2570,15 +2579,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "no-std-compat" -version = "0.4.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -2596,7 +2599,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2651,7 +2654,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2712,7 +2715,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2723,12 +2726,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numeric-sort" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f2c4adf593c928171160e2632096353bb0306d3c8447143861374d5e678e37" -dependencies = [ - "no-std-compat", -] +checksum = "5180ed575d2ae6100dc63813e3810aba273c291608cf019aa58f76784ecc331b" [[package]] name = "objc" @@ -2840,14 +2840,14 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "pango" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", @@ -2924,9 +2924,9 @@ dependencies = [ [[package]] name = "parry2d-f64" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542444b3ef557470c352ca13ba34a3d5e558b34265339320b8fb560bc82c427e" +checksum = "5565e2f28bad470868b5e5c146fd0e2716345b67d8b9f27e0fc147a1dd4790b5" dependencies = [ "approx", "arrayvec", @@ -3051,7 +3051,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3060,7 +3060,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3069,7 +3069,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3102,9 +3102,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" @@ -3154,12 +3154,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.3.9", "pin-project-lite", "rustix", "tracing", @@ -3213,12 +3214,12 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3256,9 +3257,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3338,9 +3339,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3373,14 +3374,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.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3400,7 +3401,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -3411,9 +3412,9 @@ 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 = "rgb" @@ -3426,7 +3427,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "async-fs", @@ -3476,7 +3477,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "atty", @@ -3495,7 +3496,7 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "approx", @@ -3524,7 +3525,7 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "approx", @@ -3659,11 +3660,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -3678,11 +3679,11 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" +checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "smallvec", "ttf-parser", @@ -3728,7 +3729,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cssparser", "derive_more", "fxhash", @@ -3767,14 +3768,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3864,6 +3865,12 @@ 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" @@ -3884,9 +3891,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3981,9 +3988,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum_macros" @@ -3991,7 +3998,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", @@ -4047,17 +4054,17 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "svgtypes" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d7618f12b51be8171a7cfdda1e7a93f79cbc57c4e7adf89a749cf671125241" +checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" dependencies = [ - "kurbo 0.10.4", - "siphasher", + "kurbo 0.11.0", + "siphasher 1.0.1", ] [[package]] @@ -4144,9 +4151,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4155,14 +4162,14 @@ 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", + "heck 0.5.0", "pkg-config", - "toml 0.8.10", + "toml 0.8.12", "version-compare", ] @@ -4174,9 +4181,9 @@ 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 = "tempfile" @@ -4233,22 +4240,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4312,14 +4319,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -4337,7 +4344,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -4350,18 +4357,18 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -4387,7 +4394,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4500,15 +4507,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] name = "unicode-ccc" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" [[package]] name = "unicode-ident" @@ -4574,24 +4581,24 @@ dependencies = [ [[package]] name = "usvg" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04150a94f0bfc3b2c15d4e151524d14cd06765fc6641d8b1c59a248360d4474" +checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" dependencies = [ "base64", "data-url", "flate2", "fontdb", "imagesize", - "kurbo 0.9.5", + "kurbo 0.11.0", "log", "pico-args", "roxmltree", "rustybuzz", "simplecss", - "siphasher", + "siphasher 1.0.1", "strict-num", - "svgtypes 0.14.0", + "svgtypes 0.15.0", "tiny-skia-path", "unicode-bidi", "unicode-script", @@ -4619,9 +4626,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[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" @@ -4666,7 +4673,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -4700,7 +4707,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5084,7 +5091,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index cf4c2a54af071..2d60d46d612a1 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-J9M1d6C40EpqcSU5vYVfsCruhECkPJOdhzG2IX1tTQ0="; + hash = "sha256-SqT8bJfJM+d5fewso3C22M4Qo7wY2g2QmEot/gCpwT4="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 69084140ccb45..83530518aa7d2 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng, libtiff , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.27"; + version = "0.99.29"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; + buildInputs = [ avahi gnutls libjpeg libpng libxml2 libtiff sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es="; + sha256 = "sha256-9ErTC9NztyO9o6y2FjQPl2lu1gICasZYm2tnaCVCLt8="; }; meta = with lib; { diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index ec8efcc27c2a6..c15b3033a2651 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; sha256 = "sha256-Gpr5456MCNpyam3g2qPo7S3aEZFMaUGR8bu7YmRY8xk="; }; - }."${stdenv.hostPlatform.system}"; + }."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}"); unpackPhase = '' ar x $src diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 7bce5301f938a..c15599ec66bbb 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "brscan5"; - version = "1.3.0-0"; + version = "1.3.1-0"; src = { "i686-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb"; - sha256 = "sha256-LpbPUo8iD5CcwUoIOa1UYHQXMrZZJ7PjZpcuyXhXjzk="; + hash = "sha256-BgS64vwsKESJBDz9H2MDwcGiresROSNFP1b+7+zlE5c="; }; "x86_64-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb"; - sha256 = "sha256-ntVe/e6/cdz3+LSpGilMFZecxfv74pd7ksh85SzEdKc="; + hash = "sha256-0UMbXMBlyiZI90WG5FWEP2mIZEBsxXd11dtgtyuSDnY="; }; }."${system}" or (throw "Unsupported system: ${system}"); @@ -33,9 +33,12 @@ stdenv.mkDerivation rec { postPatch = let + # Download .deb for both amd64 and i386, then unpack like unpackPhase + # to get the offset, run: + # strings -n 10 --radix=d opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 | grep "/opt/brother/scanner/brscan5/models" patchOffsetBytes = - if system == "x86_64-linux" then 86528 - else if system == "i686-linux" then 79140 + if system == "x86_64-linux" then 86592 + else if system == "i686-linux" then 79236 else throw "Unsupported system: ${system}"; in '' diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 000e8c17f9c97..3038d2be21232 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -38,9 +38,6 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch"; sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI="; }) - # generate hwdb entries for scanners handled by other backends like epkowa - # https://gitlab.com/sane-project/backends/-/issues/619 - ./sane-desc-generate-entries-unsupported-scanners.patch ]; postPatch = '' @@ -110,7 +107,7 @@ stdenv.mkDerivation { in '' mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules - ./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb + ./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb # the created 49-libsane references /bin/sh substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}" diff --git a/pkgs/applications/graphics/sane/backends/sane-desc-generate-entries-unsupported-scanners.patch b/pkgs/applications/graphics/sane/backends/sane-desc-generate-entries-unsupported-scanners.patch deleted file mode 100644 index 0fbe9f31c3f4e..0000000000000 --- a/pkgs/applications/graphics/sane/backends/sane-desc-generate-entries-unsupported-scanners.patch +++ /dev/null @@ -1,19 +0,0 @@ -sane-desc does not include unsupported .desc entries like EPSON V300 PHOTO, -which can be supported by the (unfree) epkowa driver. -But we need those entries so that unprivileged users which have installed epkowa -can use the scanner. -diff --git a/tools/sane-desc.c b/tools/sane-desc.c -index 7a8645dea..9c9719fef 100644 ---- a/tools/sane-desc.c -+++ b/tools/sane-desc.c -@@ -3243,10 +3243,6 @@ create_usbids_table (void) - - for (model = mfg->model; model; model = model->next) - { -- if ((model->status == status_unsupported) -- || (model->status == status_unknown)) -- continue; -- - if (model->usb_vendor_id && model->usb_product_id) - { - first_usbid = add_usbid (first_usbid, mfg->name, diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index bb6d2660836a8..e639efa4e2a72 100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-16"; + version = "3.32-20"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-K/ofwwlkZF13V0IZEL166n58ylm+qdh1jbXzH7LwXog="; + hash = "sha256-kFgypwSmXRkIyb0ZMcoTSgQdODfn9F81ABlFWATvh3M="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/pkgs/applications/graphics/texturepacker/default.nix b/pkgs/applications/graphics/texturepacker/default.nix index 14769c02af0eb..ccae60f1433e8 100644 --- a/pkgs/applications/graphics/texturepacker/default.nix +++ b/pkgs/applications/graphics/texturepacker/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-9HbmdMPTp6qZCEU/lIZv4HbjKUlEtPVval+y0tiYObc="; + hash = "sha256-64aAg8V61MwJjFLYcf/nv5Bp7W0+cQBZac2e1HzkJBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 1c3bf8b6ede3c..5e584696d4f3d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.29"; + version = "0.0.30"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-VGgmJPNLEsD1y6e6CRw1Wipmy9MKAQkydyHNNjPyvhQ="; + hash = "sha256-Qdjwop92udrPiczMInhvRUMn9uZu6iBMAWzqDWySy94="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index a898984d45021..90adde782c7fd 100644 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, fetchurl , lib , extra-cmake-modules , kdoctools @@ -80,6 +79,10 @@ mkDerivation { ) ''; + passthru = { + inherit kpmcore; + }; + meta = with lib; { description = "KDE Partition Manager"; longDescription = '' diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index f283964707895..2e63737deef59 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-SB8qLpa9ncAJjUkbPRuSY2eJ1fNMaLSR7BR/tgO+ZUs="; + sha256 = "sha256-usa4xSNAv0AaML7qv5kCQDA3VMz4IneLFDVyv7uPUcQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix index b64a3d8455eb8..f0bd137399655 100644 --- a/pkgs/applications/maui/default.nix +++ b/pkgs/applications/maui/default.nix @@ -15,7 +15,7 @@ See also `pkgs/applications/kde` as this is what this is based on. # Updates 1. Update the URL in `./fetch.sh`. -2. Run `callPackage ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui` +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/maui` from the top of the Nixpkgs tree. 3. Use `nixpkgs-review wip` to check that everything builds. 4. Commit the changes and open a pull request. diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 7de3325e4d967..63d89ec6941dc 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,59 +4,59 @@ { agenda = { - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.2/agenda-0.5.2.tar.xz"; - sha256 = "160y0pq3mj72wxyfnnl45488j4kpl26xpf83vlnfshiwvc6c0m3y"; - name = "agenda-0.5.2.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.3/agenda-0.5.3.tar.xz"; + sha256 = "0kx5adv8w0dm84hibaazik6y9bcxw7w7zikw546d4dlaq13pk97i"; + name = "agenda-0.5.3.tar.xz"; }; }; arca = { - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.2/arca-0.5.2.tar.xz"; - sha256 = "0l0x24m55hc20yc40yjj0zx910yzh31qn911swdli39iy4c6mxk2"; - name = "arca-0.5.2.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.3/arca-0.5.3.tar.xz"; + sha256 = "0mgn3y2jh9ifxg41fb6z14gp27f1pwfk9y8492qfp3wqfhhmycmk"; + name = "arca-0.5.3.tar.xz"; }; }; bonsai = { - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "${mirror}/stable/maui/bonsai/1.1.2/bonsai-1.1.2.tar.xz"; - sha256 = "0nzp0ixxap3q1llv42l71rygxv98hvcmqwqdw7690w650hja7zvj"; - name = "bonsai-1.1.2.tar.xz"; + url = "${mirror}/stable/maui/bonsai/1.1.3/bonsai-1.1.3.tar.xz"; + sha256 = "0xyfqaihzjdbgcd0mg81qpd12w304zlhdw8mmiyqfamxh33xksql"; + name = "bonsai-1.1.3.tar.xz"; }; }; booth = { - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.2/booth-1.1.2.tar.xz"; - sha256 = "06gg4zgpn8arnzmi54x7xbdg5wyc3a86v9z5x6y101imh6cwbhyw"; - name = "booth-1.1.2.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.3/booth-1.1.3.tar.xz"; + sha256 = "0l7bjlpm3m2wc528c6y5s5yf9rlxrl5h0c1lk9s90zzkmyhzpxrl"; + name = "booth-1.1.3.tar.xz"; }; }; buho = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.2/buho-3.0.2.tar.xz"; - sha256 = "0sllffddngzxc2wi2wszjxzb75rca0a42bdylm7pxmr5p8mafn1l"; - name = "buho-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/buho/3.1.0/buho-3.1.0.tar.xz"; + sha256 = "0pw8ljnhb3xsbsls6ynihvb5vargk13bija02s963kkbyvcrka0a"; + name = "buho-3.1.0.tar.xz"; }; }; clip = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.2/clip-3.0.2.tar.xz"; - sha256 = "0pjqk1l1cwkvwrlv1lb113cl8kggppxqhdsild83wrzbfqx9nrva"; - name = "clip-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/clip/3.1.0/clip-3.1.0.tar.xz"; + sha256 = "1pcka3z5ik5s9hv0np83f6g1fp1pgzq14h83k4l38wfcvbmnjngb"; + name = "clip-3.1.0.tar.xz"; }; }; communicator = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.2/communicator-3.0.2.tar.xz"; - sha256 = "0hmapwsgrlaiwvprpmllfy943w0sclnk4vg7sb6rys1i96f3yz6r"; - name = "communicator-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.1.0/communicator-3.1.0.tar.xz"; + sha256 = "0207jz891d8hs36ma51jbm9af53423lvfir41xmbw5k8j1wi925p"; + name = "communicator-3.1.0.tar.xz"; }; }; era = { @@ -68,139 +68,139 @@ }; }; fiery = { - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.2/fiery-1.1.2.tar.xz"; - sha256 = "0ba3bxhvfzkpwrrnfyhbvprlhdv2vmgmi41lpq2pian0d3nkc05s"; - name = "fiery-1.1.2.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.3/fiery-1.1.3.tar.xz"; + sha256 = "1wkvrp1b0y0b7mppwymxmlfrbczxqgxaws10y2001mdxryjf160b"; + name = "fiery-1.1.3.tar.xz"; }; }; index-fm = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.2/index-fm-3.0.2.tar.xz"; - sha256 = "08ncjliqzx71scmfxl3h24w9s8dgrp6gd7nf6pczyn5arqf96d81"; - name = "index-fm-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/index/3.1.0/index-fm-3.1.0.tar.xz"; + sha256 = "13pvx4rildnc0yqb3km9r9spd2wf6vwayfh0i6bai2vfklv405yg"; + name = "index-fm-3.1.0.tar.xz"; }; }; mauikit = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.2/mauikit-3.0.2.tar.xz"; - sha256 = "19317xfbyy3cg9nm1dqknvypsj9kq8phz36srwvwfyxd26kaqs2s"; - name = "mauikit-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.1.0/mauikit-3.1.0.tar.xz"; + sha256 = "1v7nas1mdkpfyz6580y1z1rk3ad0azh047y19bjy0rrpp75iclmz"; + name = "mauikit-3.1.0.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.2/mauikit-accounts-3.0.2.tar.xz"; - sha256 = "1h876vz9vfyl44pryhf5s4lkzik00zwhjvyrv7f4b1zwjz3xbqai"; - name = "mauikit-accounts-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.1.0/mauikit-accounts-3.1.0.tar.xz"; + sha256 = "0blzmjdv4cs2m4967mksj0pxpd1gvgjpkgwbwkhya36qc443yfya"; + name = "mauikit-accounts-3.1.0.tar.xz"; }; }; mauikit-calendar = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/3.0.2/mauikit-calendar-3.0.2.tar.xz"; - sha256 = "098d2alw1dnhpqwkdy0wrl6cvanyb6vg8qy5aqmgmsk0hil1s8x1"; - name = "mauikit-calendar-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.1.0/mauikit-calendar-3.1.0.tar.xz"; + sha256 = "13hf6z99ibly4cbaf4n4r54qc2vcbmf8i8qjndf35z6kxjc4iwpd"; + name = "mauikit-calendar-3.1.0.tar.xz"; }; }; mauikit-documents = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/3.0.2/mauikit-documents-3.0.2.tar.xz"; - sha256 = "1ln8nk6n2wcqdjd4l5pzam9291rx52mal7rdxs06f6fwszwifhyr"; - name = "mauikit-documents-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.1.0/mauikit-documents-3.1.0.tar.xz"; + sha256 = "1v1hbzb84rkva5icmynh87h979xgv8a8da6pfzlf1y7h6syw1wf4"; + name = "mauikit-documents-3.1.0.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.2/mauikit-filebrowsing-3.0.2.tar.xz"; - sha256 = "03dcmpw8l19mziswhhsvyiiid07qx0c4ddh8986llsz6xngdnlib"; - name = "mauikit-filebrowsing-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.1.0/mauikit-filebrowsing-3.1.0.tar.xz"; + sha256 = "146iflqb4kq25f1azajlbwlbphbk754vvf6w7fzl75pdwhqsbxvp"; + name = "mauikit-filebrowsing-3.1.0.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.2/mauikit-imagetools-3.0.2.tar.xz"; - sha256 = "1xryms7mc3lq8p67m2h3cxffyd9dk8m738ap30aq9ym62qq76psl"; - name = "mauikit-imagetools-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.1.0/mauikit-imagetools-3.1.0.tar.xz"; + sha256 = "1r7j9lg19s63325xyz6i8hzfn751s14mlpxym533mpzpx6yg784q"; + name = "mauikit-imagetools-3.1.0.tar.xz"; }; }; mauikit-terminal = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/3.0.2/mauikit-terminal-3.0.2.tar.xz"; - sha256 = "0abywv56ljxbmsi5y3x9agbgbhvscnkznja9adwjj073pavvaf1g"; - name = "mauikit-terminal-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.1.0/mauikit-terminal-3.1.0.tar.xz"; + sha256 = "0q2d8lxzhmncassnl043vrgz9am25yk060v7l7bwm6fp9vv5ix5f"; + name = "mauikit-terminal-3.1.0.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.2/mauikit-texteditor-3.0.2.tar.xz"; - sha256 = "09wdvjy8c0b5lka0fj28kl99w5y3w0nvz2mnr3ic5kn825ay1wmy"; - name = "mauikit-texteditor-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.1.0/mauikit-texteditor-3.1.0.tar.xz"; + sha256 = "0fsjqfvg2fnfmrsz9hfcw20l5yv0pi5jiww2aqyqqpy09q7jxphv"; + name = "mauikit-texteditor-3.1.0.tar.xz"; }; }; mauiman = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/3.0.2/mauiman-3.0.2.tar.xz"; - sha256 = "0aqzgdkcs6cdlsbsyiyhadambcwwa0xj2q2yj5hv5d42q25ibfs1"; - name = "mauiman-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.1.0/mauiman-3.1.0.tar.xz"; + sha256 = "1462j8xbla6jra3qpxgp5hi580lk53a6ry4fzmllqpzprwgiyx2w"; + name = "mauiman-3.1.0.tar.xz"; }; }; nota = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.2/nota-3.0.2.tar.xz"; - sha256 = "11lqdxwsdvf1vz9y1d9r38vxfsz4jfnin3c1ipsvjl0f0zn1glr6"; - name = "nota-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/nota/3.1.0/nota-3.1.0.tar.xz"; + sha256 = "0x9xaas86rhbqs7wsc7chxc4iijg73wnzj2125dgdwcridmdfxix"; + name = "nota-3.1.0.tar.xz"; }; }; pix = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.2/pix-3.0.2.tar.xz"; - sha256 = "0wlpqqbf4j7dlylxhfixrcjz0yz9csni4vnbqv9l5vkxxwf0mq4k"; - name = "pix-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/pix/3.1.0/pix-3.1.0.tar.xz"; + sha256 = "0j3xwdscjqyisv5zn8pb0mqarpfkknz3wxgzd7yl2g1gxdpl502h"; + name = "pix-3.1.0.tar.xz"; }; }; shelf = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.2/shelf-3.0.2.tar.xz"; - sha256 = "1x27grdn9qa7ysxh4fb35h5376crpbl39vpd6hn0a7c3fk74w95q"; - name = "shelf-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.1.0/shelf-3.1.0.tar.xz"; + sha256 = "166l6f5ifv5yz3sgds50bi9swdr3zl7m499myy5x8ph2jw1i2dvq"; + name = "shelf-3.1.0.tar.xz"; }; }; station = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.2/station-3.0.2.tar.xz"; - sha256 = "14i4z5lkj2rg7p5nkglqpzvrrxmf7b07kf49hh1jdk08753abc76"; - name = "station-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/station/3.1.0/station-3.1.0.tar.xz"; + sha256 = "0skwagzwd4v24ldrww727zs3chzfb1spbynzdjb0yc7pggzxn8nf"; + name = "station-3.1.0.tar.xz"; }; }; strike = { - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "${mirror}/stable/maui/strike/1.1.2/strike-1.1.2.tar.xz"; - sha256 = "01ak3h6n0z3l346nbzfabkgbzwbx1fm3l9g7myiip4518cb2n559"; - name = "strike-1.1.2.tar.xz"; + url = "${mirror}/stable/maui/strike/1.1.3/strike-1.1.3.tar.xz"; + sha256 = "1b0n56mfchcf37j33i3kxp3pd9sc2f1fq5hjfhy1s34dk8gfv947"; + name = "strike-1.1.3.tar.xz"; }; }; vvave = { - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.2/vvave-3.0.2.tar.xz"; - sha256 = "1py46ryi57757wyqfvxc2h02x33n11g1v04f0hac0zkjilp5l21k"; - name = "vvave-3.0.2.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.1.0/vvave-3.1.0.tar.xz"; + sha256 = "1ig6vzrqrq4h8y69xm6hxppzspa4vrawpn4rk6rva26j5qm7dh1l"; + name = "vvave-3.1.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 21b445944abf3..e977dffc444b6 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,49 +9,49 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA"; + version = if channel == "stable" then "8.10.30" else "8.10.30-20.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-xQQXPDC8mvQyC+z3y0n5KpRpLjrBeslwXPf28wfKVSM="; + hash = "sha256-q1PKFpBgjada7jmeXZYmH8dvy2A4lwfrQ0jQSoHVNcg="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-c26G/Zp+1Y6ZzGYeybFBJOB2gDx3k+4/Uu7sMlXHYjM="; + hash = "sha256-Zv/mnykPi9PCDX44JtGi0GPrOujSmjx1BBJuEB81CwE="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-9LrSJ9PLRXFbA7xkBbqFIZVtAuy7UrDBh7e6rlLqrM0="; + hash = "sha256-unC1cz5ooSdu4Csf7/daCyPdMy3/Lp3a76B7TBa/VXk="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-4oqpsRZ10y2uh2gp4QyHfUdKER8v8n8mjNFVwKRYkpo="; + hash = "sha256-DS6oCdr6srF+diL68a2gOskS4x+uj1i8DtL3uaaxv/I="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8="; + hash = "sha256-6I/3o+33sIkfyef8xGUWczaWykHPcvvAGv0xy/jCkKI="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0="; + hash = "sha256-ph6DBBUzdUHtYCAQiA1me3bevtVPEgIxtwbgbdgQcGY="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs="; + hash = "sha256-XzZOj1pfoCTGMTsqZlI8hKTDRJ4w7debAPYHIIwsyyY="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk="; + hash = "sha256-s+hnKhI2s6E1ZyJQxs3Wggy60LxCEr+u3tRtjTgjmZk="; }; }; }; src = fetchurl { - inherit (sources.${channel}.${stdenv.system}) url hash; + inherit (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) url hash; }; meta = with lib; { diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 1bb980203b1dd..140adde918fc9 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -110,8 +110,8 @@ in stdenv.mkDerivation { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 895ba87f4f1e4..a213c7ef89b8c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.25.1"; + version = "2.27.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-3LUfqTaLpJal/tjtRzTztm8H4wl1g4VSHWiFRukAqvE=" "zip"; - i686-linux = fetch "linux_386" "sha256-QJu4SHfM4zzHP14MKaSydAeFCvAPa4wsMh+JvWGR7J4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-erZCpCH5Q4VqGO045qKP5KAp07xKgMKrVrY54btT5BM=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-kOAbr5MrDylgEQGMYUDklKCNNkZalVfJBcUwSZSMFH0=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-yutS8xSTRABt12+mEyU99R4eCHvuAwWdO40SZlUrtdc=" "zip"; + i686-linux = fetch "linux_386" "sha256-juP//g9quhd7GRq5TNm3qAq+rOegGJ9u9F+fmGbfmbw=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-cFQ3lsHBV9fDoNK5ujTummIXA4591meP43KbiyWcbQk=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-fUwiEJxn4JdsViBQU2Odrw+Focp0ngH/RmfmW2Uu0Bo=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 13620b254a58b..7c334fb804558 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 = "5.5.3.4"; + version = "6.0.1.24"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-9ISEIKrAK6UTDM3TPizBRMU+wfiinhnaWmS5CkXpkYo="; + hash = "sha256-IgsiL5YUeOWQ/WIaTfs0Kmv2XFori8ntGZhrx7xeMkg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index c5e4557d81e50..cc47f6d75949f 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -2,8 +2,8 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "1.0.2"; sha256 = "0808lnbggp3dl116amxj1hz8cfh1a3hi8q10qwgdiwhqx919jslb"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.3"; sha256 = "1z6j171ffw2w5c44j2d7kqki6c8j229i3xbi6pgpk9pas41mdrxx"; }) + (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"; }) @@ -57,42 +57,46 @@ (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.34.0"; sha256 = "1jrs5fc8k99mh1kipvvlgwm0qlacrsh82bbpdclb84xz0h6nwwrh"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.36.2"; sha256 = "02d658sjxd853lmqhhh13yhycm9nlmghl3p3fdn6iwmwhkly9qvy"; }) (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) (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.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.0"; sha256 = "0nigij1vz1biw1sl64mflx68fgm34lmnvq47z2n5p0qs534kvkhb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.0"; sha256 = "025ixbv7jq294n8yw4y1bbd92iz08q4jqnnzqp0s8lgi49sk9dad"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.0"; sha256 = "1qyyfxww980s7xzw048kc8iqzarzbaj11cb5lrsisv777ccipma5"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.0"; sha256 = "0ns56pws3zlwjk8mjyfr02zl3nnhzka76wabfabplfci62bgi3h0"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.0"; sha256 = "1b52s7z01wkg83dpkpyg7girjflm84zr65pacsfwm2hvhb9xa2w6"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.0"; sha256 = "0pvr4yga99fqr4z8s8js9hxki5c92qy7scvpqwslws5mri625m38"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.0"; sha256 = "0zzrwp5in56fhc2cdmn4i44v2jf13frbjwpb9v8s7fkr9ky4wh5w"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.0"; sha256 = "1qbf922frk4c0cam57d98f3d5q5226pgrgjm7pfcamwy5whvx5sh"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.0"; sha256 = "0my1fihyh86rckfzbrvl5kdcq34yp0ywl8azs2gx3c27sg4pjrp2"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.2"; sha256 = "09yn3hi9npgi8rs2vyfyzcl8vbfa1lqcl6lgpymw5d7lg0hc511w"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.0"; sha256 = "0n7iw8ppjyps4sg0rfh5pags4wq58yg1g9vnxfwa73z38jws2c10"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.0"; sha256 = "0n9aab1cxf8w23dl4yw7rqpi47v7gd02csq3zisc5whsrb9i0xbq"; }) + (fetchNuGet { pname = "MSTest"; version = "3.2.2"; sha256 = "19pkywdlmgccv2ri52gbpb3pgci1ymb2ba5qhyp9j19vks6gf6cj"; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.2.2"; sha256 = "1ap7imbqxmz2namgli796pxj91gyn01k6xxnllldpwwbxpd0ijgd"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "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"; }) @@ -101,12 +105,22 @@ (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.5.0"; sha256 = "06rdagrxqws5yq1nrsd8chv3n9kgrb8rg894vcc40a8w6v27222w"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.0-rc.1"; sha256 = "0scpylqwqmp7lpmixci88v6zf7jzf3zrcbrhl30bd4p7r4alw2lp"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0"; sha256 = "099yivazj5078076xydssf38r71c5nk3n7hy0lr51p80gln1vdha"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0-rc.1"; sha256 = "0rnl9pkwbz2srkss3ay05jjrfkyzibxa6vx0hg7rzfpyjinhaycs"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0"; sha256 = "1j7bxhpwpcrjr4am7s4mavjjpasikv4kp8glmxiw5x9zvc0x0ix7"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0-rc.1"; sha256 = "18r7m4zjimkkwjqw8hd9xa85lnj1fy45xyd338fbpp9nm73j9r2g"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.8.0-rc.1"; sha256 = "0fiz7qpzn64by4dlc5r9ha2qrp1j9w9lm6c7bzpvshzwz8ifamv7"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.0-rc.1"; sha256 = "0p5sybp1b8fkccibhlmjlvdnhryscqh9f435c34bwp6vvllxf17z"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.7.1"; sha256 = "19r12csxwdrvl5yx88mv68rzj2cy43004pwldy6q89v42sr01kyi"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.7.1"; sha256 = "0mvrcz2mg3caf4lcwi1ai7i7ldb27p4y2qx9vckfjal203bps352"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.7.0"; sha256 = "0klyd24akymj2hpjlnzmz7x9kggj4amhaqx1zh9nxjvlmmy64gxy"; }) + (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.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.5.0"; sha256 = "1160r9splvmxrgk3b8yzgls0pxxwak3iqfr8v13ah5mwy8zkpx71"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) @@ -119,11 +133,13 @@ (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 = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index d7f70bb8c62d0..535f161e24723 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 = "7406f7126a8351db67aad9f3a0f90c9dc123d80d"; + version = "f70253c96e76fff5c5537c7be57a57de4e273eb8"; 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-yTBJoihDc4z4+a03S56MQORvz/l6aqBDzLEi0UrM1N4="; + hash = "sha256-hw6M8O486vnWqdO4DqljOoGEevykpxhez3QL745VfIk="; }; - npmDepsHash = "sha256-S/OwjmfAyEVZfWQ7vqKFctbJRqED0HVJlWEGXrqB1Ys="; + npmDepsHash = "sha256-GpGVM9c5yaLHi77qpShm30/uObg1TdLFCIhmFvLEhaU="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/actiona/default.nix b/pkgs/applications/misc/actiona/default.nix new file mode 100644 index 0000000000000..0d1500448a140 --- /dev/null +++ b/pkgs/applications/misc/actiona/default.nix @@ -0,0 +1,112 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + + bluez, + libnotify, + libXdmcp, + libXtst, + opencv, + qtbase, + qtmultimedia, + qtscript, + qttools, + qtx11extras, + qtxmlpatterns, + + # Running with TTS support causes the program to freeze for a few seconds every time at startup, + # so it is disabled by default + textToSpeechSupport ? false, + qtspeech, +}: + +let + # For some reason qtscript wants to use the same version of qtbase as itself + # This override makes it think that they are the same version + qtscript' = qtscript.overrideAttrs (oldAttrs: { + inherit (qtbase) version; + postPatch = '' + substituteInPlace .qmake.conf \ + --replace-fail ${oldAttrs.version} ${qtbase.version} + ''; + }); +in +stdenv.mkDerivation (finalAttrs: { + pname = "actiona"; + version = "3.10.2"; + + src = fetchFromGitHub { + owner = "Jmgr"; + repo = "actiona"; + rev = "v${finalAttrs.version}"; + hash = "sha256-4RKCNEniBBx0kDwdHVZOqXYeGCsH8g6SfVc8JdDV0hI="; + fetchSubmodules = true; + }; + + patches = + [ + # Sets the proper search location for the `.so` files and the translations + ./fix-paths.patch + ] + ++ lib.optionals (!textToSpeechSupport) [ + # Removes TTS support + ./disable-tts.patch + ]; + + postPatch = '' + substituteInPlace gui/src/mainwindow.cpp executer/src/executer.cpp tools/src/languages.cpp \ + --subst-var out + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + bluez + libnotify + libXdmcp + libXtst + opencv + qtbase + qtmultimedia + qtscript' + qttools + qtx11extras + qtxmlpatterns + ] ++ lib.optionals textToSpeechSupport [ qtspeech ]; + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + cmakeFlags = [ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ]; + + # udev is used by the system-actionpack + env.NIX_LDFLAGS = "-ludev"; + + installPhase = '' + runHook preInstall + + install -Dm755 {execution,actiontools,tools}/*.so -t $out/lib + install -Dm755 actions/actionpack*.so -t $out/lib/actions + install -Dm755 actiona actexec -t $out/bin + install -Dm644 translations/*.qm -t $out/share/actiona/translations + install -Dm644 $src/actiona.desktop -t $out/share/applications + install -Dm644 $src/gui/icons/actiona.png -t $out/share/icons/hicolor/48x48/apps + + runHook postInstall + ''; + + meta = { + description = "A cross-platform automation tool"; + homepage = "https://github.com/Jmgr/actiona"; + license = lib.licenses.gpl3Only; + mainProgram = "actiona"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/actiona/disable-tts.patch b/pkgs/applications/misc/actiona/disable-tts.patch new file mode 100644 index 0000000000000..977959db254c1 --- /dev/null +++ b/pkgs/applications/misc/actiona/disable-tts.patch @@ -0,0 +1,54 @@ +diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt +index ca861145..3e3d3d3b 100644 +--- a/actions/system/CMakeLists.txt ++++ b/actions/system/CMakeLists.txt +@@ -66,8 +66,6 @@ set(HEADERS + ${HEADERS_PREFIX}/actions/playsoundinstance.hpp + ${HEADERS_PREFIX}/actions/systemdefinition.hpp + ${HEADERS_PREFIX}/actions/systeminstance.hpp +- ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp +- ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp + ${HEADERS_PREFIX}/code/mediaplaylist.hpp + ${HEADERS_PREFIX}/code/notify.hpp + ${HEADERS_PREFIX}/code/process.hpp +@@ -131,7 +129,6 @@ find_package(Qt5 ${ACT_MINIMUM_QT_VERSION} COMPONENTS + DBus + Multimedia + MultimediaWidgets +- TextToSpeech + REQUIRED) + + target_include_directories(${PROJECT} +@@ -153,7 +150,6 @@ target_link_libraries(${PROJECT} + Qt5::DBus + Qt5::Multimedia + Qt5::MultimediaWidgets +- Qt5::TextToSpeech + ${LIBNOTIFY_LIBRARIES} + ${BLUEZ_LIBRARIES} + ${UDEV_LIBRARIES} +diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp +index c5768415..27a899d6 100644 +--- a/actions/system/src/actionpacksystem.hpp ++++ b/actions/system/src/actionpacksystem.hpp +@@ -31,10 +31,6 @@ + #include "actions/playsounddefinition.hpp" + #include "actions/findimagedefinition.hpp" + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +-#include "actions/texttospeechdefinition.hpp" +-#endif +- + #include "code/system.hpp" + #include "code/mediaplaylist.hpp" + #include "code/notify.hpp" +@@ -67,9 +63,6 @@ public: + addActionDefinition(new Actions::DetachedCommandDefinition(this)); + addActionDefinition(new Actions::PlaySoundDefinition(this)); + addActionDefinition(new Actions::FindImageDefinition(this)); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +- addActionDefinition(new Actions::TextToSpeechDefinition(this)); +-#endif + } + + QString id() const override { return QStringLiteral("system"); } diff --git a/pkgs/applications/misc/actiona/fix-paths.patch b/pkgs/applications/misc/actiona/fix-paths.patch new file mode 100644 index 0000000000000..1c26159bbfdbd --- /dev/null +++ b/pkgs/applications/misc/actiona/fix-paths.patch @@ -0,0 +1,39 @@ +diff --git a/executer/src/executer.cpp b/executer/src/executer.cpp +index da848dad..5bd7e986 100644 +--- a/executer/src/executer.cpp ++++ b/executer/src/executer.cpp +@@ -45,7 +45,7 @@ bool Executer::start(QIODevice *device, const QString &filename) + QSettings settings; + QString locale = settings.value(QStringLiteral("gui/locale"), QLocale::system().name()).toString(); + +- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), locale); ++ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), locale); + #ifndef Q_OS_WIN + if(mActionFactory->actionPackCount() == 0) + mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), locale); +diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp +index 6052648e..3c802d93 100644 +--- a/gui/src/mainwindow.cpp ++++ b/gui/src/mainwindow.cpp +@@ -322,7 +322,7 @@ void MainWindow::postInit() + if(mSplashScreen) + mSplashScreen->showMessage(tr("Loading actions...")); + +- mActionFactory->loadActionPacks(QApplication::applicationDirPath() + QStringLiteral("/actions"), mUsedLocale); ++ mActionFactory->loadActionPacks(QStringLiteral("@out@/lib/actions"), mUsedLocale); + #ifndef Q_OS_WIN + if(mActionFactory->actionPackCount() == 0) + mActionFactory->loadActionPacks(QStringLiteral("actiona/actions/"), mUsedLocale); +diff --git a/tools/src/languages.cpp b/tools/src/languages.cpp +index 4926936e..18e9aabb 100644 +--- a/tools/src/languages.cpp ++++ b/tools/src/languages.cpp +@@ -79,7 +79,7 @@ namespace Tools + void Languages::installTranslator(const QString &componentName, const QString &locale) + { + auto translator = new QTranslator(QCoreApplication::instance()); +- if(!translator->load(QStringLiteral("%1/translations/%2_%3").arg(QCoreApplication::applicationDirPath()).arg(componentName).arg(locale))) ++ if(!translator->load(QStringLiteral("@out@/share/actiona/translations/%1_%2").arg(componentName).arg(locale))) + { + auto path = QStringLiteral("%1/translations/%2_%3").arg(QDir::currentPath()).arg(componentName).arg(locale); + if(!translator->load(path)) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 4bfeaea7d36a2..8fe269ddab230 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -12,6 +12,7 @@ , qtdeclarative , qtwayland , qt5compat +, qttools , wrapQtAppsHook , nix-update-script , pkg-config @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.22.17"; + version = "0.23.0"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2wu4bOQDKoZ4DDzTttXXRNDluvuJth7M1pCvJmYQ+f4="; + sha256 = "sha256-L6qHaksArgwySk6J7N5zamUDWh5qa6zTtPFdpxU2NTM="; fetchSubmodules = true; }; @@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qtdeclarative qtwayland qt5compat + qttools ] ++ (with python3Packages; [ python pybind11 ]); postPatch = '' @@ -73,7 +75,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://albertlauncher.github.io"; changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; + # See: https://github.com/NixOS/nixpkgs/issues/279226 + license = licenses.unfree; maintainers = with maintainers; [ ericsagnes synthetica ]; mainProgram = "albert"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix deleted file mode 100644 index f45fb95aba59a..0000000000000 --- a/pkgs/applications/misc/apvlv/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy -, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - version = "0.1.5"; - pname = "apvlv"; - - src = fetchFromGitHub { - owner = "naihe2010"; - repo = "apvlv"; - rev = "v${version}"; - sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; - }; - - env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; - - nativeBuildInputs = [ - cmake - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - poppler pcre libxkbcommon libepoxy - freetype gtk3 - libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation - ]; - - patches = [ - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; - sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w"; - }) - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; - sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; - }) - # fix build with gcc7 - (fetchpatch { - url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch"; - sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi"; - }) - ./fix-build-with-poppler-0.73.0.patch - ]; - - installPhase = '' - # binary - mkdir -p $out/bin - cp src/apvlv $out/bin/apvlv - - # displays pdfStartup.pdf as default pdf entry - mkdir -p $out/share/doc/apvlv/ - cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf - cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade - '' - + lib.optionalString (!stdenv.isDarwin) '' - install -D ../apvlv.desktop $out/share/applications/apvlv.desktop - ''; - - meta = with lib; { - homepage = "http://naihe2010.github.io/apvlv/"; - description = "PDF viewer with Vim-like behaviour"; - mainProgram = "apvlv"; - longDescription = '' - apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 - with Vim-like behaviour. - ''; - - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = [ maintainers.ardumont ]; - }; - -} diff --git a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch b/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch deleted file mode 100644 index d2a7831dca639..0000000000000 --- a/pkgs/applications/misc/apvlv/fix-build-with-poppler-0.73.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc -index 765b112..83d133f 100644 ---- a/src/ApvlvPdf.cc -+++ b/src/ApvlvPdf.cc -@@ -29,7 +29,7 @@ - #include "ApvlvPdf.h" - - #ifndef POPPLER_WITH_GDK --#include <goo/gtypes.h> -+#include <goo/gfile.h> - - static void - copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index f00271bf72339..a3dc7b737d4b4 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.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-wgVu5Yr65Gu1z5SEWy5l4B6UiI5bIobBfZLhL7s+SRE="; + hash = "sha256-YRRm8/yDwQIUjzqYzlqij8h2ri39Q7L8jVh5fgrZbGs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 60559768994ef..64fa760ef9d24 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -38,7 +38,7 @@ , pcre , qhull , systemd -, tbb_2021_8 +, tbb_2021_11 , webkitgtk , wxGTK31 , xorg @@ -53,18 +53,18 @@ let ]; }); openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { - buildInputs = [ openexr boost179 tbb_2021_8 jemalloc c-blosc ilmbase ]; + buildInputs = [ openexr boost179 tbb_2021_11 jemalloc c-blosc ilmbase ]; }); in stdenv.mkDerivation rec { pname = "bambu-studio"; - version = "01.08.04.51"; + version = "01.09.00.70"; src = fetchFromGitHub { owner = "bambulab"; repo = "BambuStudio"; rev = "v${version}"; - hash = "sha256-rqD1+3Q4ZUBgS57iCItuLX6ZMP7VQuedaJmgKB1szgs="; + hash = "sha256-RBctBhKo7mjxsP7OJhGfoU1eIiGVuMiAqwwSU+gsMds="; }; nativeBuildInputs = [ @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { opencascade-occt openvdb_tbb_2021_8 pcre - tbb_2021_8 + tbb_2021_11 webkitgtk wxGTK31' xorg.libX11 @@ -166,10 +166,20 @@ stdenv.mkDerivation rec { ) ''; + # needed to prevent collisions between the LICENSE.txt files of + # bambu-studio and orca-slicer. + postInstall = '' + mkdir -p $out/share/doc + mv $out/LICENSE.txt $out/share/doc/LICENSE.txt + if [ -f $out/README.md ]; then + mv $out/README.md $out/share/doc/README.md + fi + ''; + meta = with lib; { description = "PC Software for BambuLab's 3D printers"; homepage = "https://github.com/bambulab/BambuStudio"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ zhaofengli ]; mainProgram = "bambu-studio"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index dc55a4d02f694..5e10050078d6c 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.1"; + version = "2.0.0"; pname = "orca-slicer"; # Don't inherit patches from bambu-studio @@ -13,7 +13,7 @@ bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; + hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; }; meta = with lib; { diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index cec4e8dd8c913..f4e25200835b7 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { description = "A collection of small bash scripts for heavy terminal users"; homepage = "https://github.com/alexanderepstein/Bash-Snippets"; license = licenses.mit; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 0767c3c038181..128c668eb0a51 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -5,13 +5,13 @@ appimageTools.wrapAppImage rec { pname = "bazecor"; - version = "1.3.9"; + 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-qve5xxhhyVej8dPDkZ7QQdeDUmqGO4pHJTykbS4RhAk="; + hash = "sha256-iMurQDF0CBMnJnjmEgNIKYd8C5B4FguMi4Jqa3dHr3o="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 @@ -26,7 +26,7 @@ appimageTools.wrapAppImage rec { # also make sure to update the udev rules in ./10-dygma.rules; most recently # taken from - # https://github.com/Dygmalab/Bazecor/blob/v1.3.9/src/main/utils/udev.ts#L6 + # https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c0fb3b336d0fc..8cc7d4dd01f61 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -16,7 +16,6 @@ cudaSupport ? config.cudaSupport, dbus, embree, - fetchpatch, fetchurl, fetchzip, ffmpeg, @@ -68,7 +67,7 @@ pkg-config, potrace, pugixml, - python310Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 + python311Packages, # 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, @@ -82,7 +81,7 @@ }: let - python3Packages = python310Packages; + python3Packages = python311Packages; python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -100,25 +99,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-qqDnKdp1kc+/RXcq92NFl32qp7EaCvNdmPkxPiRgd6M="; + hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg="; }; - patches = [ - ./draco.patch - (fetchpatch { - url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff"; - hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g="; - }) - (fetchpatch { - # https://projects.blender.org/blender/blender/issues/117145 - url = "https://projects.blender.org/blender/blender/commit/eb99895c972b6c713294f68a34798aa51d36034a.patch"; - hash = "sha256-95nG5mW408lhKJ2BppgaUwBMMeXeGyBqho6mCfB53GI="; - }) - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; postPatch = ( @@ -247,7 +235,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!stdenv.isAarch64) [ embree - openimagedenoise + (openimagedenoise.override { inherit cudaSupport; }) ] ++ ( if (!stdenv.isDarwin) then diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 4e2a5e29999c7..36d4000214adc 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -82,6 +82,6 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index da1e263107b3c..ce72458f3a0f6 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-+kz3Fz1RDQ+ROgv7y0WNAWvIESKvHKID8UnSeCh8yA4="; + hash = "sha256-Ilzv4HXW6ZmEVNUWQm04cHZ71FEgjfWVX9IvrfYCHIk="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; - hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; + hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8="; }) (fetchpatch { name = "0007-Hardening-Qt-code.patch"; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index 82b96777d324d..d0065910e9065 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.20.0"; + version = "5.22.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-W8//7sU/ewA99ea3lDPi+IbdAdswt9rukdjoQWj2H9Q="; + hash = "sha256-WLJMF+G7pP7OZh6xDrO/JpNV9iX/9XBmi5kRPp3TJBI="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 74623b544af1f..ffa44c63f96c4 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.0.4"; + version = "1.1.2"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = "refs/tags/v${version}"; - hash = "sha256-SMx3a0pzhNahRzmenZwPQPCBgqoBGo9n3RcNcimNGBE="; + hash = "sha256-gDDFrF1yK6mWwkb3KJVRj6P5aiH1pQ/xL17XwVb4rfk="; }; nativeBuildInputs = [ @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index 5d9a97d95425f..89110aead938b 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -11,7 +11,7 @@ , pkg-config , python3 , stdenv -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs build-aux/meson/postinstall.py ''; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 79472e3840a4b..bb7201de590f6 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , ninja -, extra-cmake-modules , qtbase , qtsvg , qttools diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 95d3a2aa93336..12f7920d3bf72 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ gebner ]; }; }; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 27b180da7309b..0de7e18f172d7 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Engine for processing 3D models into 3D printing instructions"; mainProgram = "CuraEngine"; homepage = "https://github.com/Ultimaker/CuraEngine"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index e7c72f3285594..9dc19941a0720 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -1,13 +1,16 @@ -{ lib -, fetchFromGitHub -, git -, python3 +{ + lib, + fetchFromGitHub, + git, + python3, }: - -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { packageOverrides = self: super: { pydantic = super.pydantic_1; }; }; +in +python.pkgs.buildPythonApplication rec { pname = "dbx"; version = "0.8.18"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "databrickslabs"; @@ -17,67 +20,64 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "cryptography" + "databricks-cli" "rich" "typer" ]; - pythonRemoveDeps = [ - "mlflow-skinny" - ]; + pythonRemoveDeps = [ "mlflow-skinny" ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + build-system = with python.pkgs; [ setuptools ]; + + nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - aiohttp - click - cookiecutter - cryptography - databricks-cli - jinja2 - mlflow - pathspec - pydantic - pyyaml - requests - retry - rich - tenacity - typer - watchdog - ] ++ typer.optional-dependencies.all; + propagatedBuildInputs = + with python.pkgs; + [ + aiohttp + click + cookiecutter + cryptography + databricks-cli + jinja2 + mlflow + pathspec + pydantic + pyyaml + requests + retry + rich + tenacity + typer + watchdog + ] + ++ typer.optional-dependencies.all; passthru.optional-dependencies = with python3.pkgs; { - aws = [ - boto3 - ]; + aws = [ boto3 ]; azure = [ azure-storage-blob azure-identity ]; - gcp = [ - google-cloud-storage - ]; + gcp = [ google-cloud-storage ]; }; - nativeCheckInputs = [ - git - ] ++ (with python3.pkgs; [ - pytest-asyncio - pytest-mock - pytest-timeout - pytestCheckHook - ]); + nativeCheckInputs = + [ git ] + ++ (with python3.pkgs; [ + pytest-asyncio + pytest-mock + pytest-timeout + pytestCheckHook + ]); preCheck = '' export HOME=$(mktemp -d) export PATH="$PATH:$out/bin" ''; - pytestFlagsArray = [ - "tests/unit" - ]; + pytestFlagsArray = [ "tests/unit" ]; disabledTests = [ # Fails because of dbfs CLI wrong call @@ -87,10 +87,27 @@ python3.pkgs.buildPythonApplication rec { "test_python_basic_sanity_check" ]; - pythonImportsCheck = [ - "dbx" + disabledTestPaths = [ + "tests/unit/api/" + "tests/unit/api/test_build.py" + "tests/unit/api/test_destroyer.py" + "tests/unit/api/test_jinja.py" + "tests/unit/commands/test_configure.py" + "tests/unit/commands/test_deploy_jinja_variables_file.py" + "tests/unit/commands/test_deploy.py" + "tests/unit/commands/test_destroy.py" + "tests/unit/commands/test_execute.py" + "tests/unit/commands/test_help.py" + "tests/unit/commands/test_launch.py" + "tests/unit/models/test_deployment.py" + "tests/unit/models/test_destroyer.py" + "tests/unit/models/test_task.py" + "tests/unit/sync/test_commands.py" + "tests/unit/utils/test_common.py" ]; + pythonImportsCheck = [ "dbx" ]; + meta = with lib; { description = "CLI tool for advanced Databricks jobs management"; homepage = "https://github.com/databrickslabs/dbx"; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index f977fd1980bb9..03e5e05852ad0 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { hash = "sha256-1hZ7yAKTvkk20ho+QOqFEtspBvFztAtfmITs2uxhdmQ="; }; - vendorHash = "sha256-d38s5sSvENIou+rlphXIrrOcGOdsvkNaMJlhiXVWN6c="; + vendorHash = "sha256-DFssAic2YtXNH1Jm6zCDv1yPNz3YUXaFLs7j7rNHhlE="; proxyVendor = true; diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index a934f0349cd28..52a004a830177 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/schmiddi-on-mobile/railway"; license = lib.licenses.gpl3Plus; mainProgram = "diebahn"; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ dotlambda lilacious ]; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index b53fab409b04b..890c1886a4177 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null +# update script dependencies +, gitUpdater +}: stdenv.mkDerivation rec { pname = "dmenu"; - version = "5.2"; + version = "5.3"; src = fetchurl { url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "sha256-1NTKd7WRQPJyJy21N+BbuRpZFPVoAmUtxX5hp3PUN5I="; + sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8="; }; buildInputs = [ libX11 libXinerama zlib libXft ]; @@ -24,11 +27,15 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; + passthru.updateScript = gitUpdater { + url = "git://git.suckless.org/dmenu"; + }; + meta = with lib; { description = "A 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 ]; + maintainers = with maintainers; [ pSub globin qusic ]; platforms = platforms.all; mainProgram = "dmenu"; }; diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index 5e163df938b88..cbc23dc9eb4f1 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -60,8 +60,6 @@ stdenv.mkDerivation rec { env = lib.optionalAttrs stdenv.isDarwin { GETTEXT_DIR = gettext; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; meta = with lib; { diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index f28d1bf7e0434..f8914a7bb8f45 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -12,6 +12,10 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-xOyj5XerOwgfvI0qj7+7oshDvd18h5IeZvcJTis8nWo="; }; + build-system = with python3Packages; [ + cython + ]; + propagatedBuildInputs = with python3Packages; [ # requirements pyaes @@ -36,7 +40,6 @@ python3Packages.buildPythonApplication rec { cryptography # requirements-hw - cython trezor keepkey btchip-python diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index b615a61f5a193..4ca911126c5ba 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -10,7 +10,7 @@ }: let - version = "4.4.4"; + version = "4.5.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -32,11 +32,11 @@ python3.pkgs.buildPythonApplication { owner = "Groestlcoin"; repo = "electrum-grs"; rev = "refs/tags/v${version}"; - sha256 = "0fl01qdvb1z6l6kwipj1lj0qmjk3mzw25wv7yh5j1hh1f5lng0s8"; + sha256 = "1k078jg3bw4n3kcxy917m30x1skxm679w8hcw8mlxb94ikrjc66h"; }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -56,17 +56,25 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng certifi + jsonpatch # plugins btchip-python ledger-bitcoin ckcc-protocol keepkey trezor + bitbox02 + cbor + pyserial ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ]; + checkInputs = with python3.pkgs; lib.optionals enableQt [ + pyqt6 + ]; + postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ @@ -104,7 +112,6 @@ python3.pkgs.buildPythonApplication { meta = with lib; { description = "Lightweight Groestlcoin wallet"; - mainProgram = "electrum-grs"; longDescription = '' An easy-to-use Groestlcoin client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) @@ -116,5 +123,6 @@ python3.pkgs.buildPythonApplication { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ gruve-p ]; + mainProgram = "electrum-grs"; }; } diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index 3c9a2765b2a26..deeaca6b86be1 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -53,7 +53,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64", + "base64 0.21.7", "bitflags 2.4.1", "brotli", "bytes", @@ -262,6 +262,12 @@ dependencies = [ ] [[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] name = "alloc-no-stdlib" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -346,12 +352,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] name = "arbitrary-int" version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" [[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.48", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] name = "atomic-polyfill" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -378,6 +407,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] name = "az" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -405,6 +457,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -447,6 +505,12 @@ dependencies = [ ] [[package]] +name = "bitstream-io" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -477,6 +541,12 @@ dependencies = [ ] [[package]] +name = "built" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" + +[[package]] name = "bumpalo" version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -547,6 +617,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[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" @@ -554,9 +634,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -579,9 +659,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -589,9 +669,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -601,9 +681,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -613,9 +693,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "claxon" @@ -822,8 +902,8 @@ dependencies = [ [[package]] name = "enolib" -version = "0.4.1" -source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.1#1ca85dc8af9f74f65b199b2ab6c5c94f5b119b93" +version = "0.4.2" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.2#b97102e1890d91f184469f9c778d07df7d117adc" [[package]] name = "equivalent" @@ -849,12 +929,12 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.13.0" +version = "0.14.0" dependencies = [ "actix-files", "actix-web", "alac", - "base64", + "base64 0.22.0", "bincode", "chrono", "clap", @@ -1010,9 +1090,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", @@ -1092,9 +1172,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1186,9 +1266,9 @@ dependencies = [ [[package]] name = "id3" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba0a11a3cf6f08d58a5629531bdb4e7c3b8b595e9812a31a7058b1176c4631e" +checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" dependencies = [ "bitflags 2.4.1", "byteorder", @@ -1207,23 +1287,44 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", "color_quant", "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] +name = "image-webp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +dependencies = [ + "byteorder", + "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.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1235,9 +1336,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" @@ -1249,6 +1350,17 @@ 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.48", +] + +[[package]] name = "iso_country" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1267,6 +1379,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1308,9 +1429,6 @@ 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" @@ -1357,12 +1475,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[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 = "libvips" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfedc1cd1634c8bc74e91653646f4be7ec7630fcd828ae35a35272a0bbfd9e8d" dependencies = [ - "num-derive", + "num-derive 0.3.3", "num-traits", ] @@ -1400,6 +1529,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1409,6 +1547,16 @@ 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 = "memchr" version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1529,6 +1677,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[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" @@ -1539,6 +1693,23 @@ 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-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1550,6 +1721,38 @@ dependencies = [ ] [[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.48", +] + +[[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-bigint", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1606,9 +1809,9 @@ dependencies = [ [[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 = "opus" @@ -1770,6 +1973,25 @@ dependencies = [ ] [[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.48", +] + +[[package]] name = "pulldown-cmark" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1797,6 +2019,12 @@ dependencies = [ ] [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quote" version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1836,6 +2064,56 @@ 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 0.4.2", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] name = "raw-window-handle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1900,6 +2178,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] name = "rmp3" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1963,18 +2250,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -1993,6 +2280,15 @@ dependencies = [ ] [[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.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2042,6 +2338,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" @@ -2099,9 +2404,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -2132,6 +2437,25 @@ dependencies = [ ] [[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] name = "thiserror" version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2208,9 +2532,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2251,6 +2575,40 @@ dependencies = [ ] [[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", +] + +[[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.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] name = "tracing" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2330,12 +2688,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[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 = "v_htmlescape" version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" [[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" @@ -2423,9 +2798,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" dependencies = [ "core-foundation", "home", @@ -2440,9 +2815,9 @@ dependencies = [ [[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" @@ -2674,6 +3049,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + +[[package]] name = "zerocopy" version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2761,6 +3145,12 @@ dependencies = [ ] [[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" @@ -2768,3 +3158,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 9aa92101a1cce..3b1cdf51321b8 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -16,20 +16,20 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-Q0jsqOWeXEfekegxYvq3oIIuVMGyeKL1no2Jh4JByD0="; + hash = "sha256-gHlm5ZQ5u+gOSBERlg6iYJxGTfs/+L4y2TY+ZOsVYh8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.4.1" = "sha256-Uz9AXksD3YO6PjSr29RZCQjdoPiFBTXecbE0fluA0LU="; + "enolib-0.4.2" = "sha256-FJuWKcwjoi/wKfTzxghobNWblhnKRdUvHOejhpCF7kY="; }; }; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index ad2cc905d9cfa..656db72846300 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.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-fLBWHhvfqEiaZkFyNs8CKr5vFMQ5mrbo/X3oGwJmFoo="; + sha256 = "sha256-fFwO06edv2f/remnKc5snAjgmqveVNqxHiUcTlfe+4Y="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index d77c658f96173..150bbd5700371 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.28.1"; + version = "1.29.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-mLi0Nvy26PRusdzVrwzuj7UcYN+NGLap+fEAYMpm48w="; + sha256 = "sha256-Zh/H1XAUcFl20yPLt9uIqBLDvUH8ATL9g6oFwvyhkzw="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 0bdf8df306a83..5e5d205c8ae99 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -1,43 +1,76 @@ -{ lib, stdenv, fetchurl, jdk, jre, ant }: +{ + lib, + stdenv, + fetchurl, + ant, + jdk, + jre, + makeWrapper, + stripJavaArchivesHook, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freemind"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/freemind/freemind-src-${version}.tar.gz"; - sha256 = "06c6pm7hpwh9hbmyah3lj2wp1g957x8znfwc5cwygsi7dc98b0h1"; + url = "mirror://sourceforge/freemind/freemind-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-AYKFEmsn6uc5K4w7+1E/Jb1wuZB0QOXrggnyC0+9hhk="; }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + stripJavaArchivesHook + ]; - preConfigure = '' - chmod +x check_for_duplicate_resources.sh - sed 's,/bin/bash,${stdenv.shell},' -i check_for_duplicate_resources.sh + postPatch = '' + # disable the <buildnumer> task because it would edit version.properties + # and add a "last edited" header to it, which is non-deterministic + sed -i '/<buildnumber/d' build.xml - ## work around javac encoding errors - export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + # replace dependency on `which` + substituteInPlace freemind.sh \ + --replace-fail "which" "type -p" ''; - buildPhase = "ant dist"; + preConfigure = '' + chmod +x *.sh + patchShebangs *.sh + ''; + + # Workaround for javac encoding errors + # Note: not sure if this is still needed + env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8"; + + buildPhase = '' + runHook preBuild + ant build + runHook postBuild + ''; installPhase = '' - mkdir -p $out/{bin,nix-support} - cp -r ../bin/dist $out/nix-support - sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh - - cat >$out/bin/freemind <<EOF - #! ${stdenv.shell} - JAVA_HOME=${jre} $out/nix-support/dist/freemind.sh - EOF - chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh} + runHook preInstall + ant dist -Ddist=$out/share/freemind + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/share/freemind/freemind.sh $out/bin/freemind \ + --set JAVA_HOME ${jre} ''; - meta = with lib; { + meta = { description = "Mind-mapping software"; - mainProgram = "freemind"; homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + mainProgram = "freemind"; + maintainers = with lib.maintainers; [ tomasajt ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + ]; }; -} +}) diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/applications/misc/fspy/default.nix index d2384446ed3c2..1a4504d5608c0 100644 --- a/pkgs/applications/misc/fspy/default.nix +++ b/pkgs/applications/misc/fspy/default.nix @@ -19,6 +19,7 @@ in appimageTools.wrapType2 { description = "A cross platform app for quick and easy still image camera matching"; license = licenses.gpl3; homepage = "https://fspy.io/"; + knownVulnerabilities = [ "Vendors Electron 2.0 (end-of-life)" ]; maintainers = with maintainers; [ polygon ]; platforms = platforms.linux; mainProgram = "fspy"; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 496ef38626bc9..e456fd595617a 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -22,16 +22,16 @@ assert svgSupport -> enableCairo; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.9.2"; + version = "1.10.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; - repo = pname; - rev = version; - hash = "sha256-X1P/ghX97KCQcrNk44Cy2IAGuZ8DDwHBWzh1AHLDvd4="; + repo = "fuzzel"; + rev = finalAttrs.version; + hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg="; }; depsBuildBuild = [ @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fionera polykernel rodrgz ]; platforms = with platforms; linux; }; -} +}) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 09c0cdd0d1c4e..c4dd51951bd2b 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -1,16 +1,24 @@ -{ lib, buildPythonApplication, fetchPypi, requests, yt-dlp, pytestCheckHook }: +{ lib, buildPythonApplication, fetchPypi, fetchpatch, requests, yt-dlp, pytestCheckHook }: buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.8"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-tfNmKgWKr2TGQNgvC/qo2+Dvij4LUL0Zy77mfTcci2k="; + sha256 = "sha256-PgbfppyJCpgFupBQng8MUPihbDmit4C+xWnSzCJyu5k="; }; + patches = [ + # catch general Exceptions. Remove with the next release. + (fetchpatch { + url = "https://github.com/mikf/gallery-dl/commit/5227bb6b1d62ecef5b281592b0d001e7f9c101e3.patch"; + hash = "sha256-rVsd764siP/07XBPVDnpxMm/4kLiH3fp9+NtpHHH23U="; + }) + ]; + propagatedBuildInputs = [ requests yt-dlp diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 939205017fe7b..fd7bed5234c83 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "geoipupdate"; - version = "6.1.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-/iLWy3yKO34nnn5ygAewR036PzgUGIqdhXNK4fx3Ym8="; + sha256 = "sha256-OWo8puUjzMZXZ80HMpCrvRGUVdclnSxk7rHR5egOU1Y="; }; - vendorHash = "sha256-jW5/09sOUvPZVM1wzL4xg/a14kZ0KsM8e+zEQoADsl4="; + vendorHash = "sha256-MApZUtI9JewMBbImuV3vsNG89UvCfxcBg3TZiuk/nvg="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index 4c507edfb06f1..b58d5e67d6084 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -10,7 +10,7 @@ , ninja , pkg-config , rustc -, wrapGAppsHook +, wrapGAppsHook4 , python3 , git , glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 python3 git desktop-file-utils diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix index 8aa5a3be717b4..4b0a2a9c41a7b 100644 --- a/pkgs/applications/misc/go-org/default.nix +++ b/pkgs/applications/misc/go-org/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Org-mode parser and static site generator in go"; homepage = "https://niklasfasching.github.io/go-org"; license = licenses.mit; - maintainers = with maintainers; [ payas ]; + maintainers = with maintainers; [ bhankas ]; mainProgram = "go-org"; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 9cc9b3bf6d476..ce8a0888ffc9b 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.6"; + version = "3.7-DEV2404"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; + hash = "sha256-u2igcnOulgJGZT46/Z3vSsce9mr3VsxkD3mTeQPvUOg="; }; buildInputs = [ diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index fc707ca3c5473..007084e44aa09 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,18 +1,19 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.3.2) - asciidoctor (2.0.18) + RedCloth (4.3.4) + asciidoctor (2.0.22) + base64 (0.2.0) builder (3.2.4) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) crass (1.0.6) creole (0.5.0) - execjs (2.8.1) + execjs (2.9.1) expression_parser (0.9.0) - ffi (1.15.5) + ffi (1.16.3) gemojione (4.3.3) json - github-markup (4.0.1) + github-markup (4.0.2) gollum (5.3.2) gemojione (~> 4.1) gollum-lib (>= 5.2.3, < 6.0) @@ -45,51 +46,51 @@ GEM mime-types (~> 3.4) rugged (~> 1.5) htmlentities (4.3.4) - i18n (1.13.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - loofah (2.20.0) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mime-types (3.4.1) + nokogiri (>= 1.12.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - mini_portile2 (2.8.2) + mime-types-data (3.2024.0305) + mini_portile2 (2.8.5) multi_json (1.15.0) mustache (1.1.1) mustache-sinatra (2.0.0) mustache (~> 1.0) mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nokogiri (1.16.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) octicons (12.1.0) nokogiri (>= 1.6.3.1) org-ruby (0.9.12) rubypants (~> 0.2) - psych (5.1.0) + psych (5.1.2) stringio - racc (1.6.2) - rack (2.2.7) + 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.5.0) + rdoc (6.6.3.1) psych (>= 4.0.0) - rexml (3.2.5) + rexml (3.2.6) rouge (3.30.0) rss (0.2.9) rexml ruby2_keywords (0.0.5) rubypants (0.7.1) - rugged (1.6.3) + rugged (1.7.2) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -106,23 +107,24 @@ GEM rack-protection (= 2.2.4) sinatra (= 2.2.4) tilt (~> 2.0) - sprockets (3.7.2) + sprockets (3.7.3) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-helpers (1.4.0) sprockets (>= 2.2) - stringio (3.0.6) + stringio (3.1.0) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - tilt (2.1.0) + tilt (2.3.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.8.2) + unf_ext (0.0.9.1) useragent (0.16.10) webrick (1.8.1) wikicloth (0.8.3) @@ -144,4 +146,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.4.12 + 2.5.6 diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 8d106d5bc8b9f..95533bffd1072 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -4,10 +4,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv"; + sha256 = "1mnan6dxw4aqii9kcmp1s3sc91jiwaqkdpsg6g01fdisb6xz3n56"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.22"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; }; builder = { groups = ["default"]; @@ -24,10 +34,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; crass = { groups = ["default"]; @@ -54,10 +64,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; expression_parser = { groups = ["default"]; @@ -74,10 +84,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; gemojione = { dependencies = ["json"]; @@ -95,10 +105,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p40hbrrzq9gypkx0p8wqdqa2gfmmw2cd9a0sv2dw1nnk1qbcl8y"; + sha256 = "0mv2l0h3v5g4cwqh2lgb3braafh8n3v2s84i573wi5m79f4qhw1z"; type = "gem"; }; - version = "4.0.1"; + 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"]; @@ -149,20 +159,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.4"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; kramdown = { dependencies = ["rexml"]; @@ -192,10 +202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.20.0"; + version = "2.22.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -203,30 +213,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2024.0305"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.5"; }; multi_json = { groups = ["default"]; @@ -276,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; + sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; type = "gem"; }; - version = "1.14.3"; + version = "1.16.3"; }; octicons = { dependencies = ["nokogiri"]; @@ -309,30 +319,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1msambb54r3d1sg6smyj4k2pj9h9lz8jq4jamip7ivcyv32a85vz"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.2"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.3"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.9"; }; rack-protection = { dependencies = ["rack"]; @@ -372,30 +382,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r2cxscapr9saqjw8dlp89as7jvc2mlz1h5kssrmkbz105qmfcm"; + sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; type = "gem"; }; - version = "6.5.0"; + version = "6.6.3.1"; }; RedCloth = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; + sha256 = "15r2h7rfp4bi9i0bfmvgnmvmw0kl3byyac53rcakk4qsv7yv4caj"; type = "gem"; }; - version = "4.3.2"; + version = "4.3.4"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rouge = { groups = ["default"]; @@ -443,10 +453,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; + sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch"; type = "gem"; }; - version = "1.6.3"; + version = "1.7.2"; }; sass = { dependencies = ["sass-listen"]; @@ -493,15 +503,15 @@ version = "2.2.4"; }; sprockets = { - dependencies = ["concurrent-ruby" "rack"]; + dependencies = ["base64" "concurrent-ruby" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "0lyc6mx4yalsnxc9yp4a5xra4nz1nwwbk5634wlfncml0ll1bnnw"; type = "gem"; }; - version = "3.7.2"; + version = "3.7.3"; }; sprockets-helpers = { dependencies = ["sprockets"]; @@ -519,10 +529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10w46rlh844kax248l1m3pyrj94n1qpc9691j8r5v0rzdxibpy7v"; + sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; type = "gem"; }; - version = "3.0.6"; + version = "3.1.0"; }; therubyrhino = { dependencies = ["therubyrhino_jar"]; @@ -550,10 +560,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; + sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; twitter-text = { dependencies = ["unf"]; @@ -593,10 +603,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; type = "gem"; }; - version = "0.0.8.2"; + version = "0.0.9.1"; }; useragent = { groups = ["default"]; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 59912ef6b1ac8..2e139b0d71cad 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -120,6 +120,6 @@ mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; - knownVulnerabilities = [ "Includes vulnerable bundled libraries." ]; + 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 1af03a1528a26..aef599323b81d 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with lib; { description = "A simple text-based Minecraft modpack manager"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = src.meta.homepage; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix deleted file mode 100644 index 67e246227f06d..0000000000000 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, exiv2, libxml2, gtk3 -, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: - -stdenv.mkDerivation rec { - pname = "gpscorrelate"; - version = "2.0"; - - src = fetchFromGitHub { - owner = "dfandrich"; - repo = pname; - rev = version; - sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl"; - }; - - patches = [ - (fetchpatch { - name = "gpscorrelate-2.0-exiv2-0.28.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-/5czvSh2siPmohXWHQEg6VWCUQnZxEm2livLsEOAa6c="; - }) - ]; - - nativeBuildInputs = [ - desktop-file-utils - docbook_xml_dtd_42 - docbook_xsl - libxslt - pkg-config - wrapGAppsHook - ]; - - buildInputs = [ - exiv2 - gtk3 - libxml2 - ]; - - makeFlags = [ - "prefix=${placeholder "out"}" - "CC=${stdenv.cc.targetPrefix}cc" - "CXX=${stdenv.cc.targetPrefix}c++" - "CFLAGS=-DENABLE_NLS" - ]; - - doCheck = true; - - installTargets = [ "install" "install-po" "install-desktop-file" ]; - - meta = with lib; { - description = "A GPS photo correlation tool, to add EXIF geotags"; - - longDescription = '' - Digital cameras are cool. So is GPS. And, EXIF tags are really - cool too. - - What happens when you merge the three? You end up with a set of - photos taken with a digital camera that are "stamped" with the - location at which they were taken. - - The EXIF standard defines a number of tags that are for use with GPS. - - A variety of programs exist around the place to match GPS data - with digital camera photos, but most of them are Windows or - MacOS only. Which doesn't really suit me that much. Also, each - one takes the GPS data in a different format. - ''; - - license = licenses.gpl2Plus; - homepage = "https://dfandrich.github.io/gpscorrelate/"; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix index 5d703f7d6e374..18a8f53966897 100644 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -9,7 +9,7 @@ , gobject-introspection , vulkan-tools , python3 -, wrapGAppsHook +, wrapGAppsHook4 , gdk-pixbuf , lsb-release , glxinfo @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja gobject-introspection - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 227177d14369f..b4e2acc645fbe 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.17"; + version = "13.18"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-pk6PMQDPvyfUS5PMRu6pz/QrRrOfbq9oGsMk0ZDawDM="; + hash = "sha256-FetXV1D1aW7eanhPQkNzcGwKMMwzXLhBZjrzg1LD980="; }; buildInputs = [ diff --git a/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch b/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch new file mode 100644 index 0000000000000..e1573ba5de33e --- /dev/null +++ b/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch @@ -0,0 +1,19 @@ +diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py +index f25030e..59c1c90 100644 +--- a/gramps/gen/utils/grampslocale.py ++++ b/gramps/gen/utils/grampslocale.py +@@ -370,8 +370,12 @@ class GrampsLocale: + ) + else: + # bug12278, _build_popup_ui() under linux and macOS +- locale.textdomain(self.localedomain) +- locale.bindtextdomain(self.localedomain, self.localedir) ++ if hasattr(locale, 'textdomain'): ++ locale.textdomain(self.localedomain) ++ locale.bindtextdomain(self.localedomain, self.localedir) ++ else: ++ gettext.textdomain(self.localedomain) ++ gettext.bindtextdomain(self.localedomain, self.localedir) + + self.rtl_locale = False + if self.language[0] in _RTL_LOCALES: diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index bd0690b381a95..fdfcfe4ce3160 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , fetchFromGitHub , gtk3 , pythonPackages @@ -10,8 +9,8 @@ , gobject-introspection , wrapGAppsHook , gettext -, # Optional packages: - enableOSM ? true + # Optional packages: +, enableOSM ? true , osm-gps-map , glib-networking , enableGraphviz ? true @@ -21,13 +20,29 @@ }: let - inherit (pythonPackages) python buildPythonApplication; + inherit (pythonPackages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.1.6"; + version = "5.2.2"; pname = "gramps"; pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "gramps-project"; + repo = "gramps"; + rev = "refs/tags/v${version}"; + hash = "sha256-umyc5G4p0GSEQEtq6sPUgtq1waNL1OW7iLxnf5dGcLc="; + }; + + patches = [ + # textdomain doesn't exist as a property on locale when running on Darwin + ./check-locale-hasattr-textdomain.patch + # disables the startup warning about bad GTK installation + ./disable-gtk-warning-dialog.patch + ]; + nativeBuildInputs = [ wrapGAppsHook intltool @@ -38,6 +53,7 @@ buildPythonApplication rec { nativeCheckInputs = [ glibcLocales + pythonPackages.unittestCheckHook pythonPackages.jsonschema pythonPackages.mock pythonPackages.lxml @@ -52,55 +68,25 @@ buildPythonApplication rec { ++ lib.optional enableGhostscript ghostscript ; - src = fetchFromGitHub { - owner = "gramps-project"; - repo = "gramps"; - rev = "v${version}"; - hash = "sha256-BerkDXdFYfZ3rV5AeMo/uk53IN2U5z4GFs757Ar26v0="; - }; - - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; - patches = [ - # fix for running tests with a temporary home - remove next release - # https://gramps-project.org/bugs/view.php?id=12577 - (fetchpatch { - url = "https://github.com/gramps-project/gramps/commit/1e95d8a6b5193d655d8caec1e6ab13628ad123db.patch"; - hash = "sha256-2riWB13Yl+tk9+Tuo0YDLoxY2Rc0xrJKfb+ZU7Puzxk="; - }) - ]; - - # Same installPhase as in buildPythonApplication but without --old-and-unmanageble - # install flag. - installPhase = '' - runHook preInstall - - mkdir -p "$out/${python.sitePackages}" - - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/${python.sitePackages} \ - --prefix="$out" - - eapth="$out/${python.sitePackages}/easy-install.pth" - if [ -e "$eapth" ]; then - # move colliding easy_install.pth to specifically named one - mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth - fi - - rm -f "$out/${python.sitePackages}"/site.py* - - runHook postInstall + preCheck = '' + export HOME=$(mktemp -d) + mkdir .git # Make gramps think that it's not in an installed state ''; - preCheck = '' - export HOME=$TMPDIR + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + ) ''; # https://github.com/NixOS/nixpkgs/issues/149812 @@ -111,8 +97,8 @@ buildPythonApplication rec { description = "Genealogy software"; mainProgram = "gramps"; homepage = "https://gramps-project.org"; - maintainers = with maintainers; [ jk pinpox ]; - changelog = "https://github.com/gramps-project/gramps/blob/v${version}/ChangeLog"; + maintainers = with maintainers; [ jk pinpox tomasajt ]; + changelog = "https://github.com/gramps-project/gramps/blob/${src.rev}/ChangeLog"; longDescription = '' Every person has their own story but they are also part of a collective family history. Gramps gives you the ability to record the many details of diff --git a/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch b/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch new file mode 100644 index 0000000000000..c97fe9dde9f41 --- /dev/null +++ b/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch @@ -0,0 +1,14 @@ +diff --git a/gramps/gui/grampsgui.py b/gramps/gui/grampsgui.py +index 0c0d4c3..522f65a 100644 +--- a/gramps/gui/grampsgui.py ++++ b/gramps/gui/grampsgui.py +@@ -573,9 +573,6 @@ class Gramps: + dbstate = DbState() + self._vm = ViewManager(app, dbstate, config.get("interface.view-categories")) + +- if lin() and glocale.lang != "C" and not gettext.find(GTK_GETTEXT_DOMAIN): +- _display_gtk_gettext_message(parent=self._vm.window) +- + _display_translator_message(parent=self._vm.window) + + self._vm.init_interface() diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index 449b154cb8b62..fe6ec4f677aa8 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "harsh"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-MpKfUvDqwkvPsnjTxR3fohzYfSLQ2Nx25czYOE8LpK4="; + hash = "sha256-NgYmzRoJCoFpfo4NXnQKCp/gvN9g076Y9Pq8CnMrC/s="; }; - vendorHash = "sha256-zjLXq64uC5iRm9uxUGDW5127z25gNSVV2qhVVXuYqY0="; + vendorHash = "sha256-Xzyu6jy4sbZPZv0EIksA2snlsivc0jp02QoOYpmFtQw="; meta = with lib; { description = "CLI habit tracking for geeks"; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index b044c7fedbed2..8672169d02abc 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "heimer"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-VIlNahpSRQNpfOKXnI/GQANuhZ+vnoXsudwHmRbHIjs="; + hash = "sha256-47bQmT2bHcbWpeosuF/vpSJcws4SqTmalY/XFEf7cxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index f20f70c3b0286..bd765c864d220 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "inlyne"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "trimental"; repo = pname; rev = "v${version}"; - hash = "sha256-kZQREYnauR8xusyX6enBPUKHSe39aBLlrZjKEjJlfx0="; + hash = "sha256-Kae8WnahA/6k6QT5htYU2+diAFkmxVsbVaxRUlhf39o="; }; - cargoHash = "sha256-2mQFr2nLJ/iBLpdOUmerY6F2C8Kt+/vMEjS6THpmJic="; + cargoHash = "sha256-M6daK2y9HBRDV2wQjw87g1QYOqiJBfRf9uW1Eg6z6C8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/inochi2d/creator-dub-lock.json b/pkgs/applications/misc/inochi2d/creator-dub-lock.json new file mode 100644 index 0000000000000..97570d2d6678b --- /dev/null +++ b/pkgs/applications/misc/inochi2d/creator-dub-lock.json @@ -0,0 +1,148 @@ +{ + "dependencies": { + "bcaa": { + "version": "0.0.8", + "sha256": "1v8qy98hjdgfsdx6zg9n09sfpfqsh57nbsn8phw82rssi0gysgsr" + }, + "bindbc-loader": { + "version": "1.0.3", + "sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j" + }, + "bindbc-sdl": { + "version": "1.1.3", + "sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88" + }, + "dcv": { + "version": "0.3.0", + "sha256": "02fd7wig6i618r7l7alw0hfljbwjvq13fkyhwcpsdd7r5x2f7hyk" + }, + "ddbus": { + "version": "3.0.0-beta.2", + "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs" + }, + "diet-ng": { + "version": "1.8.1", + "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv" + }, + "dportals": { + "version": "0.1.0", + "sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh" + }, + "dunit": { + "version": "1.0.16", + "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb" + }, + "dxml": { + "version": "0.4.4", + "sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w" + }, + "eventcore": { + "version": "0.9.29", + "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa" + }, + "facetrack-d": { + "version": "0.7.8", + "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0" + }, + "fghj": { + "version": "1.0.2", + "sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj" + }, + "i18n-d": { + "version": "1.0.2", + "sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g" + }, + "i2d-imgui": { + "version": "0.8.0", + "sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw" + }, + "i2d-opengl": { + "version": "1.0.0", + "sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912" + }, + "imagefmt": { + "version": "2.1.2", + "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h" + }, + "inmath": { + "version": "1.0.6", + "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" + }, + "inochi2d": { + "version": "0.8.3", + "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l" + }, + "kra-d": { + "version": "0.5.5", + "sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz" + }, + "libasync": { + "version": "0.8.6", + "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj" + }, + "memutils": { + "version": "1.0.10", + "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" + }, + "mir-algorithm": { + "version": "3.22.0", + "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq" + }, + "mir-core": { + "version": "1.7.0", + "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62" + }, + "mir-linux-kernel": { + "version": "1.0.1", + "sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6" + }, + "mir-random": { + "version": "2.2.19", + "sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb" + }, + "openssl": { + "version": "3.3.3", + "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" + }, + "openssl-static": { + "version": "1.0.3+3.0.8", + "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr" + }, + "psd-d": { + "version": "0.6.3", + "sha256": "0qbwkvzgrvd6m67p14ari4iiajmhfi2x1id4da971qxiprfm1993" + }, + "silly": { + "version": "1.1.1", + "sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb" + }, + "stdx-allocator": { + "version": "2.77.5", + "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj" + }, + "taggedalgebraic": { + "version": "0.11.22", + "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r" + }, + "tinyfiledialogs": { + "version": "0.10.1", + "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi" + }, + "vibe-container": { + "version": "1.3.0", + "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair" + }, + "vibe-core": { + "version": "2.8.2", + "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr" + }, + "vibe-d": { + "version": "0.9.8", + "sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k" + }, + "vmc-d": { + "version": "1.1.3", + "sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm" + } + } +} diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix new file mode 100644 index 0000000000000..9b1c4f67fc7f9 --- /dev/null +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + callPackage, +}: + +# Note for maintainers: +# +# These packages are only allowed to be packaged under the the condition that we +# - patch source/creator/config.d to not point to upstream's bug tracker +# - use the "barebones" configuration to remove the mascot and logo from the build +# +# We have received permission by the owner to go ahead with the packaging, as we have met all the criteria +# https://github.com/NixOS/nixpkgs/pull/288841#issuecomment-1950247467 + +let + mkGeneric = builderArgs: callPackage ./generic.nix { inherit builderArgs; }; +in +{ + inochi-creator = mkGeneric rec { + pname = "inochi-creator"; + appname = "Inochi Creator"; + version = "0.8.4"; + + src = fetchFromGitHub { + owner = "Inochi2D"; + repo = "inochi-creator"; + rev = "v${version}"; + hash = "sha256-wsB9KIZyot2Y+6QpQlIXRzv3cPCdwp2Q/ZfDizAKJc4="; + }; + + dubLock = ./creator-dub-lock.json; + + patches = [ + # Upstream asks that we change the bug tracker URL to not point to the upsteam bug tracker + (substituteAll { + src = ./support-url.patch; + assignees = "TomaSajt"; # should be a comma separated list of the github usernames of the maintainers + }) + # Change how duplicate locales differentiate themselves (the store paths were too long) + ./translations.patch + ]; + + meta = { + # darwin has slightly different build steps + broken = stdenv.isDarwin; + changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}"; + description = "An open source editor for the Inochi2D puppet format"; + }; + }; + + inochi-session = mkGeneric rec { + pname = "inochi-session"; + appname = "Inochi Session"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "Inochi2D"; + repo = "inochi-session"; + rev = "v${version}"; + hash = "sha256-yq/uMWEeydZun07/7hgUaAw3IruRqrDuGgbe5NzNYxw="; + }; + + dubLock = ./session-dub-lock.json; + + preFixup = '' + patchelf $out/share/inochi-session/inochi-session --add-needed cimgui.so + ''; + + dontStrip = true; # symbol lookup error: undefined symbol: , version + + meta = { + # darwin has slightly different build steps, aarch fails to build because of some lua related error + broken = stdenv.isDarwin || stdenv.isAarch64; + changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; + description = "An application that allows streaming with Inochi2D puppets"; + }; + }; +} diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix new file mode 100644 index 0000000000000..6666a63ca1ed9 --- /dev/null +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -0,0 +1,139 @@ +{ + lib, + buildDubPackage, + fetchFromGitHub, + writeShellScriptBin, + + cmake, + gettext, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + + dbus, + freetype, + SDL2, + gnome, + + builderArgs, +}: + +let + cimgui-src = fetchFromGitHub { + owner = "Inochi2D"; + repo = "cimgui"; + rev = "49bb5ce65f7d5eeab7861d8ffd5aa2a58ca8f08c"; + hash = "sha256-XcnZbIjwq7vmYBnMAs+cEpJL8HB8wrL098FXGxC+diA="; + fetchSubmodules = true; + }; + + inherit (builderArgs) + pname + appname + version + dubLock + meta + ; +in +buildDubPackage ( + builderArgs + // { + nativeBuildInputs = [ + cmake # used for building `i2d-imgui` + gettext # used when generating translations + copyDesktopItems + makeWrapper + + # A fake git implementation to be used by the `gitver` package + # It is a dependency of the main packages and the `inochi2d` dub dependency + # A side effect of this script is that `inochi2d` will have the same version listed as the main package + (writeShellScriptBin "git" "echo v${version}") + ]; + + buildInputs = [ + dbus + freetype + SDL2 + ]; + + dontUseCmakeConfigure = true; + + # these deps are not listed inside `dub.sdl`, so they didn't get auto-generated + # these are used for generating version info when building + dubLock = lib.recursiveUpdate (lib.importJSON dubLock) { + dependencies = { + gitver = { + version = "1.6.1"; + sha256 = "sha256-NCyFik4FbD7yMLd5zwf/w4cHwhzLhIRSVw1bWo/CZB4="; + }; + semver = { + version = "0.3.2"; + sha256 = "sha256-l6c9hniUd5xNsJepq8x30e0JTjmXs4pYUmv4ws+Nrn4="; + }; + }; + }; + + postConfigure = '' + cimgui_dir=("$DUB_HOME"/packages/i2d-imgui/*/i2d-imgui) + + # `i2d-imgui` isn't able to find SDL2 by default due to it being written in lower case + # this is only an issue when compiling statically (session) + substituteInPlace "$cimgui_dir/dub.json" \ + --replace-fail '"sdl2"' '"SDL2"' + + # The `i2d-cimgui` dub dependency fetched inside the auto-generated `*-deps.nix` file + # which doesn't know that it's actually a git repo, so it doesn't fetch its submodules. + # Upstream uses a cmake script to fetch the `cimgui` submodule anyway, which we can't do + # We get around this by manually pre-fetching the submodule and copying it into the right place + cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui" + + # Disable the original cmake fetcher script + substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \ + --replace-fail "PullSubmodules(" "# PullSubmodules(" \ + --replace-fail "\''${cimgui_SUBMOD_DIR}" "cimgui" + ''; + + preBuild = '' + # Generate translations (if possible) + . gentl.sh + + # Use the fake git to generate version info + dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta + ''; + + # Use the "barebones" configuration so that we don't include the mascot and icon files in out build + dubFlags = [ "--config=barebones" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/${pname} + cp -r out/* $out/share/${pname} + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = appname; + exec = pname; + comment = meta.description; + categories = [ "Utility" ]; + }) + ]; + + postFixup = '' + # Add support for `open file` dialog + makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]} + ''; + + meta = { + homepage = "https://inochi2d.com/"; + license = lib.licenses.bsd2; + mainProgram = pname; + maintainers = with lib.maintainers; [ tomasajt ]; + } // meta; + } +) diff --git a/pkgs/applications/misc/inochi2d/session-dub-lock.json b/pkgs/applications/misc/inochi2d/session-dub-lock.json new file mode 100644 index 0000000000000..30a486e549c5c --- /dev/null +++ b/pkgs/applications/misc/inochi2d/session-dub-lock.json @@ -0,0 +1,140 @@ +{ + "dependencies": { + "bindbc-loader": { + "version": "1.0.3", + "sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j" + }, + "bindbc-lua": { + "version": "0.5.1", + "sha256": "116lcplxxl39x6m2sr9zkszdbrm1pa285sjqijnqxqy99jajnhc7" + }, + "bindbc-sdl": { + "version": "1.1.3", + "sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88" + }, + "bindbc-spout2": { + "version": "0.1.1", + "sha256": "03r4xsjpwys4nlfhas4hjqygzs764dzsr789b091iczp56pp9w9z" + }, + "ddbus": { + "version": "3.0.0-beta.2", + "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs" + }, + "diet-ng": { + "version": "1.8.1", + "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv" + }, + "dportals": { + "version": "0.1.0", + "sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh" + }, + "dunit": { + "version": "1.0.16", + "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb" + }, + "eventcore": { + "version": "0.9.29", + "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa" + }, + "facetrack-d": { + "version": "0.7.8", + "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0" + }, + "fghj": { + "version": "1.0.2", + "sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj" + }, + "i18n-d": { + "version": "1.0.2", + "sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g" + }, + "i2d-imgui": { + "version": "0.8.0", + "sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw" + }, + "i2d-opengl": { + "version": "1.0.0", + "sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912" + }, + "imagefmt": { + "version": "2.1.2", + "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h" + }, + "inmath": { + "version": "1.0.6", + "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4" + }, + "inochi2d": { + "version": "0.8.3", + "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l" + }, + "inui": { + "version": "1.2.1", + "sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx" + }, + "libasync": { + "version": "0.8.6", + "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj" + }, + "lumars": { + "version": "1.6.1", + "sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9" + }, + "memutils": { + "version": "1.0.10", + "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c" + }, + "mir-algorithm": { + "version": "3.22.0", + "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq" + }, + "mir-core": { + "version": "1.7.0", + "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62" + }, + "mir-linux-kernel": { + "version": "1.0.1", + "sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6" + }, + "openssl": { + "version": "3.3.3", + "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf" + }, + "openssl-static": { + "version": "1.0.3+3.0.8", + "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr" + }, + "silly": { + "version": "1.1.1", + "sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb" + }, + "stdx-allocator": { + "version": "2.77.5", + "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj" + }, + "taggedalgebraic": { + "version": "0.11.22", + "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r" + }, + "tinyfiledialogs": { + "version": "0.10.1", + "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi" + }, + "vibe-container": { + "version": "1.3.0", + "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair" + }, + "vibe-core": { + "version": "2.8.2", + "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr" + }, + "vibe-d": { + "version": "0.9.8", + "sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k" + }, + "vmc-d": { + "version": "1.1.3", + "sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm" + } + } +} diff --git a/pkgs/applications/misc/inochi2d/support-url.patch b/pkgs/applications/misc/inochi2d/support-url.patch new file mode 100644 index 0000000000000..b52377487df8b --- /dev/null +++ b/pkgs/applications/misc/inochi2d/support-url.patch @@ -0,0 +1,13 @@ +diff --git a/source/creator/config.d b/source/creator/config.d +index 4289703..d8dea4e 100644 +--- a/source/creator/config.d ++++ b/source/creator/config.d +@@ -30,7 +30,7 @@ enum INC_BANNER_ARTIST_PAGE = "https://mastodon.art/@nighteden"; + /** + URI for bug reports, for unofficial builds this SHOULD be changed. + */ +-enum INC_BUG_REPORT_URI = "https://github.com/Inochi2D/inochi-creator/issues/new?assignees=&labels=bug&template=bug-report.yml&title=%5BBUG%5D"; ++enum INC_BUG_REPORT_URI = "https://github.com/NixOS/nixpkgs/issues/new?assignees=@assignees@&labels=0.kind%3A+bug&projects=&template=bug_report.md&title=inochi-creator:"; + + /** + URI for feature requests, for the most part this doesn't need to be changed diff --git a/pkgs/applications/misc/inochi2d/translations.patch b/pkgs/applications/misc/inochi2d/translations.patch new file mode 100644 index 0000000000000..ee21c8b332833 --- /dev/null +++ b/pkgs/applications/misc/inochi2d/translations.patch @@ -0,0 +1,22 @@ +diff --git a/source/creator/core/i18n.d b/source/creator/core/i18n.d +index 38761dd..f276ca1 100644 +--- a/source/creator/core/i18n.d ++++ b/source/creator/core/i18n.d +@@ -132,7 +132,7 @@ void markDups(TLEntry[] entries) { + // If prevEntry has same humanName as entry before prevEntry, or as this entry, + // disambiguate with the source folder + if (prevIsDup || entryIsDup) { +- prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")"; ++ prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")"; + prevEntry.humanNameC = prevEntry.humanName.toStringz; + } + prevIsDup = entryIsDup; +@@ -140,7 +140,7 @@ void markDups(TLEntry[] entries) { + } + + if (prevIsDup) { +- prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")"; ++ prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")"; + prevEntry.humanNameC = prevEntry.humanName.toStringz; + } + } diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 2c1206ca70043..2c7a76e29991f 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -14,12 +14,11 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) colorator (1.1.0) concurrent-ruby (1.2.3) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -27,12 +26,13 @@ GEM ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (3.25.3) + google-protobuf (4.26.1) + rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -77,9 +77,9 @@ GEM rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mini_portile2 (2.8.5) - minitest (5.22.2) + minitest (5.22.3) mutex_m (0.2.0) - nokogiri (1.16.2) + nokogiri (1.16.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) @@ -91,11 +91,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.6) - rouge (4.2.0) - ruby2_keywords (0.0.5) + rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.71.1) - google-protobuf (~> 3.25) + sass-embedded (1.72.0) + google-protobuf (>= 3.25, < 5.0) rake (>= 13.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 07acae17bc6f5..fc049e314e54a 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.7"; }; colorator = { groups = ["default"]; @@ -72,15 +72,14 @@ version = "2.4.1"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -134,14 +133,15 @@ version = "4.1.0"; }; google-protobuf = { + dependencies = ["rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; type = "gem"; }; - version = "3.25.3"; + version = "4.26.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.4"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -331,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; type = "gem"; }; - version = "5.22.2"; + version = "5.22.3"; }; mutex_m = { groups = ["default"]; @@ -352,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; + sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; type = "gem"; }; - version = "1.16.2"; + version = "1.16.3"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -434,20 +434,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0"; - type = "gem"; - }; - version = "4.2.0"; - }; - ruby2_keywords = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; type = "gem"; }; - version = "0.0.5"; + version = "4.2.1"; }; safe_yaml = { groups = ["default"]; @@ -465,10 +455,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa"; + sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; type = "gem"; }; - version = "1.71.1"; + version = "1.72.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 04d0e9d0cf1ee..c9cae601691ac 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -14,7 +14,7 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) classifier-reborn (2.3.0) fast-stemmer (~> 1.0) matrix (~> 0.4) @@ -26,8 +26,7 @@ GEM colorator (1.1.0) concurrent-ruby (1.2.3) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -41,12 +40,13 @@ GEM ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (3.25.3) + google-protobuf (4.26.1) + rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -81,7 +81,7 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.7.0) + jekyll-polyglot (1.8.0) jekyll (>= 4.0, >= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) @@ -114,14 +114,14 @@ GEM mercenary (0.4.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) + mime-types-data (3.2024.0305) mini_magick (4.12.0) mini_portile2 (2.8.5) - minitest (5.22.2) + minitest (5.22.3) mutex_m (0.2.0) net-http (0.4.1) uri - nokogiri (1.16.2) + nokogiri (1.16.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) @@ -137,14 +137,13 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) rexml (3.2.6) - rouge (4.2.0) - ruby2_keywords (0.0.5) + rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.71.1) - google-protobuf (~> 3.25) + sass-embedded (1.72.0) + google-protobuf (>= 3.25, < 5.0) rake (>= 13.0.0) sawyer (0.9.2) addressable (>= 2.3.5) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index b6eaa1a1eede0..d81dee1136a0d 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.7"; }; classifier-reborn = { dependencies = ["fast-stemmer" "matrix"]; @@ -126,15 +126,14 @@ version = "2.4.1"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -242,14 +241,15 @@ version = "4.1.0"; }; google-protobuf = { + dependencies = ["rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; type = "gem"; }; - version = "3.25.3"; + version = "4.26.1"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -278,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.4"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -376,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "189scj27hczbxp02s5v27r4civfqq2fr981jrp0xldwvcw5qfbll"; + sha256 = "0xbmsm30jgpbamqvbjvjgfq2w9ihdpqsbay9jrd5pljrbhvy02di"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -584,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; + sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; type = "gem"; }; - version = "3.2024.0206"; + version = "3.2024.0305"; }; mini_magick = { groups = ["default"]; @@ -614,10 +614,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; type = "gem"; }; - version = "5.22.2"; + version = "5.22.3"; }; mutex_m = { groups = ["default"]; @@ -646,10 +646,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; + sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; type = "gem"; }; - version = "1.16.2"; + version = "1.16.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -741,10 +741,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; + sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; type = "gem"; }; - version = "6.6.2"; + version = "6.6.3.1"; }; rexml = { groups = ["default"]; @@ -761,20 +761,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0"; - type = "gem"; - }; - version = "4.2.0"; - }; - ruby2_keywords = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; type = "gem"; }; - version = "0.0.5"; + version = "4.2.1"; }; safe_yaml = { groups = ["default"]; @@ -792,10 +782,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa"; + sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; type = "gem"; }; - version = "1.71.1"; + version = "1.72.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix deleted file mode 100644 index 6019ffed2b89b..0000000000000 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchzip -, copyDesktopItems -, makeWrapper -, runCommand -, appimageTools -, icu -}: -let - pname = "jetbrains-toolbox"; - version = "2.2.3.20090"; - - src = fetchzip { - url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-SqxQF5pG61CySsDzdZ1P2C9cCe/B145D0S+T4NByif8="; - stripRoot = false; - }; - - appimageContents = runCommand "${pname}-extracted" - { - nativeBuildInputs = [ appimageTools.appimage-exec ]; - } - '' - appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} - - # JetBrains ship a broken desktop file. Despite registering a custom - # scheme handler for jetbrains:// URLs, they never mark the command as - # being suitable for passing URLs to. Ergo, the handler never receives - # its payload. This causes various things to break, including login. - # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/ - sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop - ''; - - appimage = appimageTools.wrapAppImage { - inherit pname version; - src = appimageContents; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); - }; -in -stdenv.mkDerivation { - inherit pname version src appimage; - - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - - installPhase = '' - runHook preInstall - - install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg - makeWrapper ${appimage}/bin/${pname}-${version} $out/bin/${pname} \ - --append-flags "--update-failed" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [icu]} - - runHook postInstall - ''; - - desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ]; - - # Disabling the tests, this seems to be very difficult to test this app. - doCheck = false; - - meta = with lib; { - description = "Jetbrains Toolbox"; - homepage = "https://jetbrains.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ AnatolyPopov ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "jetbrains-toolbox"; - }; -} diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix index 180d46519c646..db8eec95f2b1d 100644 --- a/pkgs/applications/misc/johnny-reborn/default.nix +++ b/pkgs/applications/misc/johnny-reborn/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "johnny-reborn-engine"; - version = "0.30"; + version = "0.45"; src = fetchFromGitHub { owner = "xesf"; repo = "jc_reborn"; rev = "v${version}"; - hash = "sha256-n3ELNFvjeDzbamyQIdM9mf/A1sstuhCGzrL9NuXf90Y="; + hash = "sha256-PDh2RKdvm4LkDKi963CB5RiraWcS3FED6ug8T1J65GM="; }; buildInputs = [ SDL2 ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 3c3fc200c114c..4283d9d92abe1 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,22 +3,29 @@ }: let pname = "josm"; - version = "18969"; + version = "19039"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-a8muRwE4+9WdYVz7lYE9dRnqVIGQxL8cFmIdBr2R65U="; + hash = "sha256-iH6g18lJrvfAvtkAaVPSK7vhgdU6oI7X10GkFcwpsBs="; }; macosx = fetchurl { - url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-npXY7WJM1+9ygeAw102UtimnI/yXqs5vgPnatm4AIrI="; + url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip"; + hash = "sha256-yA+Qf76MbouiLdH9o1Ri8ptbG70YZoI13pBA9Ki61/0="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo="; + sha256 = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA="; }; }; + + # Needed as of version 19017. + baseJavaOpts = toString [ + "--add-exports=java.base/sun.security.action=ALL-UNNAMED" + "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" + "--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" + ]; in stdenv.mkDerivation rec { inherit pname version; @@ -38,7 +45,7 @@ stdenv.mkDerivation rec { # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin makeWrapper ${jre}/bin/java $out/bin/josm \ - --add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \ + --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' ''; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 43d320a4c0435..1e8113765f12b 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,27 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 -, testers -, jrnl +{ + lib, + fetchFromGitHub, + python3, + testers, + jrnl, }: python3.pkgs.buildPythonApplication rec { pname = "jrnl"; version = "4.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "jrnl-org"; - repo = pname; + repo = "jrnl"; rev = "refs/tags/v${version}"; hash = "sha256-DtujXSDJWnOrHjVgJEJNKJMhSrNBHlR2hvHeHLSIF2o="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + postPatch = '' + # Support pytest_bdd 7.1.2 and later, https://github.com/jrnl-org/jrnl/pull/1878 + substituteInPlace tests/lib/when_steps.py \ + --replace-fail "from pytest_bdd.steps import inject_fixture" "from pytest_bdd.compat import inject_fixture" + ''; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ asteval colorama cryptography @@ -43,14 +48,11 @@ python3.pkgs.buildPythonApplication rec { toml ]; - preCheck = '' export HOME=$(mktemp -d); ''; - pythonImportsCheck = [ - "jrnl" - ]; + pythonImportsCheck = [ "jrnl" ]; passthru.tests.version = testers.testVersion { package = jrnl; @@ -58,11 +60,14 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; - description = "Simple command line journal application that stores your journal in a plain text file"; + description = "Command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; + changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bryanasdev000 zalakain ]; + maintainers = with maintainers; [ + bryanasdev000 + zalakain + ]; mainProgram = "jrnl"; }; } diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index b40283538c87c..e74a45c02f311 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -27,6 +27,7 @@ , LocalAuthentication , withKeePassBrowser ? true +, withKeePassBrowserPasskeys ? true , withKeePassFDOSecrets ? true , withKeePassKeeShare ? true , withKeePassNetworking ? true @@ -70,6 +71,7 @@ stdenv.mkDerivation rec { ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix index 57e62d8d826de..55cc3f3f9810f 100644 --- a/pkgs/applications/misc/keymapp/default.nix +++ b/pkgs/applications/misc/keymapp/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.0.8"; + version = "1.1.1"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-adFQCuHkorXixn/dId/vrCcnjQ2VDDQM049UrodjFgA="; + hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 76e89cca6a472..243a485c4a52b 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "klipper-estimator"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Annex-Engineering"; repo = "klipper_estimator"; rev = "v${version}"; - hash = "sha256-tGyqJtRKdfiWnf76F3W8P5XoLLMTrPWGlZ7Kwn8n/XQ="; + hash = "sha256-OvDdANowsz3qU2KV4WbUWyDrh3sG02+lBKNtcq6ecZ8="; }; - cargoHash = "sha256-ztGPqnZfP55WXfiKDSacdsalkDVuiLcfo3g4CtkFUXc="; + cargoHash = "sha256-1O3kXeGPALSa/kNWRArk6ULG0+3UgTxVBzrsqDHHpDU="; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 8589991ff522b..789ab7c688287 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -48,7 +48,7 @@ meta = with lib; { description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ cab404 ]; mainProgram = "KlipperScreen"; }; diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index 8283cebb38ab9..43be74e134418 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -2,6 +2,7 @@ , stdenv , darwin , fetchFromGitHub +, fetchpatch , rustPlatform , pkg-config , alsa-lib @@ -28,6 +29,17 @@ rustPlatform.buildRustPackage rec { }; }; + patches = [ + # Fixes build issues due to refactored Rust compiler feature annotations. + # Should be removable with the next release after v. 0.6.1. + (fetchpatch { + name = "fix-rust-features.patch"; + url = "https://github.com/twitchax/kord/commit/fa9bb979b17d77f54812a915657c3121f76c5d82.patch"; + hash = "sha256-XQu9P7372J2dHWzvpvbPtALS0Bh8EC+J1EyG3qlak2M="; + excludes = [ "Cargo.*" ]; + }) + ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 857ca1d26a8eb..b9eea1c602cb7 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2023.04"; + version = "2024.03.1"; src = if stdenv.isAarch64 then fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - sha256 = "sha256-uuspjno0750hQMIB5HEhbV63wCna2izKOHEGIg/X0bU="; + hash = "sha256-9Bu+mWfJuPaH5nV71JMrcGipiZWfcf19KfVauCW92+I="; } else fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-tRUeRB1+UcWT49dchN0YDvd0L5n1YRdtMSFc8yy6m5o="; + hash = "sha256-EZ3iqp0A2BZwI343nvvp71RGQx6FPesUBy4Lha4Yz4U="; }; src_repo = fetchFromGitHub { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "koreader"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-c3j6hs0W0H2jDg6JVfU6ov7r7kucbqrQqf9PAvYBcJ0="; + sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix index 50a773b5c5182..55a2e04c93269 100644 --- a/pkgs/applications/misc/kuro/default.nix +++ b/pkgs/applications/misc/kuro/default.nix @@ -5,18 +5,21 @@ , makeDesktopItem , copyDesktopItems , mkYarnPackage -, electron +, electron_29 }: +let + electron = electron_29; +in mkYarnPackage rec { pname = "kuro"; version = "9.0.0"; src = fetchFromGitHub { owner = "davidsmorais"; - repo = pname; + repo = "kuro"; rev = "v${version}"; - sha256 = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; + hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; }; packageJSON = ./package.json; @@ -26,7 +29,7 @@ mkYarnPackage rec { hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI="; }; - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ makeWrapper @@ -68,21 +71,23 @@ mkYarnPackage rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "kuro"; + exec = "kuro"; + icon = "kuro"; desktopName = "Kuro"; genericName = "Microsoft To-Do Client"; comment = meta.description; categories = [ "Office" ]; - startupWMClass = pname; + startupWMClass = "kuro"; }) ]; meta = with lib; { + changelog = "https://github.com/davidsmorais/kuro/releases/tag/${src.rev}"; description = "An unofficial, featureful, open source, community-driven, free Microsoft To-Do app"; homepage = "https://github.com/davidsmorais/kuro"; license = licenses.mit; + mainProgram = "kuro"; maintainers = with maintainers; [ ChaosAttractor ]; inherit (electron.meta) platforms; }; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 27aeca89be60f..eacd64b06b557 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.10.7"; + version = "0.10.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-EC83D7tSpoDV6h363yIdX9IrTfoMd4b0hTVdW1T0pXg="; + hash = "sha256-kVnQ33gozrL6BOWQxUfiMypiIZOffeT2cMVMHIfsaWg="; name = "${pname}-${version}.AppImage"; }; @@ -60,8 +60,7 @@ in { makeWrapper ${electron_27}/bin/electron $out/bin/${pname} \ --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix deleted file mode 100644 index 192b3dd7c73ee..0000000000000 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, wrapQtAppsHook }: - -stdenv.mkDerivation rec { - pname = "masterpdfeditor"; - version = "5.9.35"; - - src = fetchurl { - url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-c5DYS0PQemZ8Sql2KjnuMspCLDJzU95rsbuIdoxWDM0="; - }; - - nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; - - buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; - - dontStrip = true; - - installPhase = '' - runHook preInstall - - p=$out/opt/masterpdfeditor - mkdir -p $out/bin - - substituteInPlace masterpdfeditor5.desktop \ - --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - - install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png - install -Dm644 -t $out/share/applications masterpdfeditor5.desktop - install -Dm755 -t $p masterpdfeditor5 - install -Dm644 license.txt $out/share/$name/LICENSE - ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 - cp -v -r stamps templates lang fonts $p - - runHook postInstall - ''; - - meta = with lib; { - description = "Master PDF Editor"; - homepage = "https://code-industry.net/free-pdf-editor/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai ]; - }; -} diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix deleted file mode 100644 index bbb4f6432fb4c..0000000000000 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32 -, desktop-file-utils, libSM, imagemagick, darwin }: - -let - inherit (darwin.apple_sdk.frameworks) Cocoa; -in -stdenv.mkDerivation rec { - pname = "mediainfo-gui"; - version = "24.01.1"; - - src = fetchurl { - url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-MupkbVyGxj1UQY0QsnNiYKtD5Lcn+B6N1ez16bXj/TQ="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - sourceRoot = "MediaInfo/Project/GNU/GUI"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Supplies technical and tag information about a video or audio file (GUI version)"; - longDescription = '' - MediaInfo is a convenient unified display of the most relevant technical - and tag data for video and audio files. - ''; - homepage = "https://mediaarea.net/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.devhell ]; - mainProgram = "mediainfo-gui"; - }; -} diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix deleted file mode 100644 index 3891715e7b237..0000000000000 --- a/pkgs/applications/misc/mediainfo/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: - -stdenv.mkDerivation rec { - pname = "mediainfo"; - version = "24.01.1"; - - src = fetchurl { - url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-MupkbVyGxj1UQY0QsnNiYKtD5Lcn+B6N1ez16bXj/TQ="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen libmediainfo zlib ]; - - sourceRoot = "MediaInfo/Project/GNU/CLI"; - - configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Supplies technical and tag information about a video or audio file"; - longDescription = '' - MediaInfo is a convenient unified display of the most relevant technical - and tag data for video and audio files. - ''; - homepage = "https://mediaarea.net/"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = [ maintainers.devhell ]; - mainProgram = "mediainfo"; - }; -} diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 79800a6c46eec..cb97ca6723089 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -8,7 +8,6 @@ , doxygen , fetchFromGitHub , ffmpeg -, freeimage , libmediainfo , libraw , libsodium @@ -28,13 +27,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.9.0.0"; + version = "4.9.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-s0E8kJ4PJmhaxVcWPCyCk/KbcX4V3IESdZhSosPlZuM="; + sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; fetchSubmodules = true; }; @@ -54,7 +53,6 @@ mkDerivation rec { cryptopp curl ffmpeg - freeimage libmediainfo libraw libsodium @@ -72,7 +70,6 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch - ./ffmpeg_44.patch ]; postPatch = '' @@ -98,7 +95,7 @@ mkDerivation rec { "--with-cryptopp" "--with-curl" "--with-ffmpeg" - "--with-freeimage" + "--without-freeimage" "--without-readline" "--without-termcap" "--with-sodium" @@ -111,10 +108,10 @@ mkDerivation rec { ''; preBuild = '' - qmake CONFIG+="release" MEGA.pro + qmake CONFIG+="nofreeimage release" MEGA.pro pushd MEGASync lrelease MEGASync.pro - DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+=release + DESKTOP_DESTDIR="$out" qmake PREFIX="$out" -o Makefile MEGASync.pro CONFIG+="nofreeimage release" popd ''; @@ -124,6 +121,6 @@ mkDerivation rec { homepage = "https://mega.nz/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.michojel ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/megasync/ffmpeg_44.patch b/pkgs/applications/misc/megasync/ffmpeg_44.patch deleted file mode 100644 index 901635e43f3e6..0000000000000 --- a/pkgs/applications/misc/megasync/ffmpeg_44.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp -=================================================================== ---- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp -+++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp -@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg( - - // Force seeking to key frames - formatContext->seek2any = false; -- videoStream->skip_to_keyframe = true; -+ // no longer exposed in ffmpeg 4.4; the line above should be sufficient -+ //videoStream->skip_to_keyframe = true; - if (decoder->capabilities & CAP_TRUNCATED) - { - codecContext->flags |= CAP_TRUNCATED; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 52b4d78bb5a9e..ce6cbc2a3b76d 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -56,9 +56,15 @@ stdenv.mkDerivation rec { (lib.cmakeBool "ZBAR" withZbar) ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = '' + # Binary is looking for .qm files in share/merkaartor + mv $out/share/merkaartor/{translations/*.qm,} + rm -r $out/share/merkaartor/translations + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/merkaartor.app $out/Applications + # Prevent wrapping, otherwise plugins will not be loaded + chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor ''; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 24970e7a5832c..df172cdb1502c 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.5.4"; + version = "2.5.5"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk="; + hash = "sha256-0DaQvVG19X9mMYZeYBz0t/DEx4MACLMjTOGMkUv9OQg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index a6f3130f9f1e1..a02647f4a9fbc 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "sha256-YDsWWC4exh+9V87WyjdMdCH1arjBct3oEXbvaFyAaMY="; + sha256 = "sha256-1r2PbBYw4mmiScKbX9BGqe4i+emSvismJfPm3opLlOg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 7f97818c7452f..40530d16391ff 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4918"; + version = "4919"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-oQ/2KY6xA/kwAroHiPqcIJlcPsTTeStUu8WN/95ZUTw="; + sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 801af789d47d8..c16b97f4a7e9d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "653"; + version = "654"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-iw414ecnOfeG3FdlIaoVOPv9BXZ95uUHuPzCQGH4G+A="; + sha256 = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg="; }; patches = [ diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 2f3be342a7a8f..a574520a5af6b 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -49,9 +49,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb1 openssl udev avahi freeipmi libmodbus i2c-tools net-snmp gd ]; + buildInputs = [ neon libusb1 openssl udev avahi freeipmi libmodbus libtool i2c-tools net-snmp gd ]; - nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; configureFlags = [ "--with-all" diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index f2d4461d4c086..22d4e20d5eef7 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -8,19 +8,19 @@ , pango , python310Packages , wrapGAppsHook -, hyprlandSupport ? false +, hyprlandSupport ? true , wlr-randr }: python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.14"; + version = "0.3.16"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-jSL+ig1mNJrnHli8B+BqvEG8jcC0gnxzbukiYgt3nP0="; + hash = "sha256-rnaBYDGEsc8oGw4yZ60NQFbNf+L0tmHYDYf+UDoDmSI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 179b4f71ae644..6733a5dac3f4d 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nwg-menu"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-menu"; rev = "v${version}"; - sha256 = "sha256-UFyC0gpKn0Ei5aOPC28iG4YI2BM5lrnl/J7RM4GjInc="; + sha256 = "sha256-PMW5QUUZcdWNOMexJVy0hYXx+y2AopT3WL29iWb9MbM="; }; - vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4="; + vendorHash = "sha256-PJvHDmyqE+eIELGRD8QHsZgZ7L0DKc2FYOvfvurzlhs="; doCheck = false; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 308a1d0d2cee1..840b048d2d4cd 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.25"; + version = "0.9.27"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ="; + hash = "sha256-GCaqFqoZ7lfyE3VD3Dgz8jVt9TtUq3XVzVeI6g3SO5E="; }; # No tests diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix deleted file mode 100644 index 043ff2352e900..0000000000000 --- a/pkgs/applications/misc/obinskit/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, lib -, fetchurl -, libxkbcommon -, systemd -, xorg -, electron_13 -, makeWrapper -, makeDesktopItem -}: -let - desktopItem = makeDesktopItem rec { - name = "Obinskit"; - exec = "obinskit"; - icon = "obinskit"; - desktopName = "Obinskit"; - genericName = "Obinskit keyboard configurator"; - categories = [ "Utility" ]; - }; - electron = electron_13; -in -stdenv.mkDerivation rec { - pname = "obinskit"; - version = "1.2.11"; - - src = fetchurl { - url = "https://s3.hexcore.xyz/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - curlOptsList = [ "--header" "Referer: https://www.hexcore.xyz/" ]; - hash = "sha256-KhCu1TZsJmcXRSWSTaYOMjt+IA4qqavBwaYzXnkgls0="; - }; - - unpackPhase = "tar -xzf $src"; - - sourceRoot = "ObinsKit_${version}_x64"; - - nativeBuildInputs = [ makeWrapper ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - mkdir -p $out/opt/obinskit - - cp -r resources $out/opt/obinskit/ - cp -r locales $out/opt/obinskit/ - - mkdir -p $out/share/{applications,pixmaps} - install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png - ln -s ${desktopItem}/share/applications/* $out/share/applications - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}" - ''; - - meta = with lib; { - description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; - homepage = "https://www.hexcore.xyz/obinskit"; - license = licenses.unfree; - maintainers = with maintainers; [ shou ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 586d9744dbe2a..1090941f8e39e 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,20 +12,20 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.5.8"; + version = "1.5.12"; appname = "Obsidian"; meta = with lib; { description = "A 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"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M="; + hash = if stdenv.isDarwin then "sha256-MSJmF5WddxbC/S7w2nWjlDxt5HPUDCoRFwJ2MZMH9Ks=" else "sha256-UQLljP7eZELTuHwX+OylXY+Wy2YK1ZEJX1IQfIvBLe8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 21b74c3c4bf13..0a13013e5da2e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,16 @@ let 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="; + }; + }); } ) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index af251385fceb3..ff920edbc272e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -53,7 +53,7 @@ in meta = with lib; { description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -72,7 +72,7 @@ in meta = with lib; { description = "Displays 3D mesh of bed topography report"; homepage = "https://github.com/jneilliii/OctoPrint-BedLevelVisualizer"; - license = licenses.agpl3; + license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -110,7 +110,7 @@ in meta = with lib; { description = "Plugin for slicing via Cura Legacy from within OctoPrint"; homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -148,7 +148,7 @@ in meta = with lib; { description = "OctoPrint-Plugin that sends the current progress of a print via M117 command"; homepage = "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ j0hax ]; }; }; @@ -186,7 +186,7 @@ in meta = with lib; { description = "Edit gcode on OctoPrint"; homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -205,7 +205,7 @@ in meta = with lib; { description = "Displays GCode documentation for Marlin in the Octoprint terminal command line"; homepage = "https://github.com/costas-basdekis/MarlinGcodeDocumentation"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -226,7 +226,7 @@ in meta = with lib; { description = "Publish printer status MQTT"; homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ peterhoeg ]; }; }; @@ -256,7 +256,7 @@ in meta = with lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -284,7 +284,7 @@ in meta = with lib; { description = "OctoPrint plugin to control ATX/AUX power supply"; homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -303,7 +303,7 @@ in meta = with lib; { description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ WhittlesJr ]; }; }; @@ -322,7 +322,7 @@ in meta = with lib; { description = "A simple stl viewer tab for OctoPrint"; homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -362,7 +362,7 @@ in meta = with lib; { description = "Beautiful themes for OctoPrint"; homepage = "https://github.com/birkbjo/OctoPrint-Themeify"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -381,7 +381,7 @@ in meta = with lib; { description = "Show printers status in window title"; homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ abbradar ]; }; }; @@ -400,7 +400,7 @@ in meta = with lib; { description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ gebner ]; }; }; @@ -419,7 +419,7 @@ in meta = with lib; { description = "A plugin for a better integration of Klipper into OctoPrint"; homepage = "https://github.com/AliceGrey/OctoprintKlipperPlugin"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ lovesegfault ]; }; }; @@ -473,7 +473,7 @@ in meta = with lib; { description = "A dashboard for Octoprint"; homepage = "https://github.com/StefanCohen/OctoPrint-Dashboard"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ j0hax ]; }; }; diff --git a/pkgs/applications/misc/onthespot/default.nix b/pkgs/applications/misc/onthespot/default.nix deleted file mode 100644 index 75ae769d33ff7..0000000000000 --- a/pkgs/applications/misc/onthespot/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, copyDesktopItems -, fetchFromGitHub -, makeDesktopItem -, python3 -, wrapQtAppsHook -}: - -python3.pkgs.buildPythonApplication rec { - pname = "onthespot"; - version = "0.5"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "casualsnek"; - repo = "onthespot"; - rev = "refs/tags/v${version}"; - hash = "sha256-VaJBNsT7uNOGY43GnzhUqDQNiPoFZcc2UaIfOKgkufg="; - }; - - nativeBuildInputs = with python3.pkgs; [ - copyDesktopItems - pythonRelaxDepsHook - wrapQtAppsHook - ]; - - propagatedBuildInputs = with python3.pkgs; [ - charset-normalizer - defusedxml - librespot - music-tag - packaging - pillow - protobuf - pyogg - pyqt5 - pyqt5-sip - pyxdg - requests - setuptools - show-in-file-manager - urllib3 - zeroconf - ]; - - pythonRemoveDeps = [ - "PyQt5-Qt5" - "PyQt5-stubs" - ]; - - pythonRelaxDeps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - meta = with lib; { - description = " QT based Spotify music downloader written in Python"; - homepage = "https://github.com/casualsnek/onthespot"; - changelog = "https://github.com/casualsnek/onthespot/releases/tag/v${version}"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 89d656798008e..52cf30b1ffba2 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -108,12 +108,13 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 ] ++ lib.optionals stdenv.isLinux [ alsa-utils - elfutils libselinux libsepol util-linux xorg.libXdmcp xorg.libXtst + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ] ++ lib.optionals stdenv.isDarwin [ lame ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 283970a6e75ef..dcb578dd56789 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -96,7 +96,7 @@ buildPythonApplication rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Orca"; + homepage = "https://orca.gnome.org/"; description = "Screen reader"; mainProgram = "orca"; longDescription = '' diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 2713f1f769702..f369508edd7ef 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -29,13 +29,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.03.05-4"; + version = "2024.03.31-8"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-vPpf7pZOkVjRlFcGULcxGy4eBLZRmqcINSFiNh8DUHI="; + hash = "sha256-U8tKrL5tnhT/RMvxROk8Q4lO22ylqiMM1QonZ1Rn+CY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index fc46ffb7fface..230bc80d180a1 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; - license = licenses.agpl3; + license = licenses.agpl3Only; }; } diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 077f9472c4305..e53cc20874ba6 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.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-0BpdyZIUvDRGadomYRhEq5YLoPXsF9d3tewIi+q6wFs="; + hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 762dec67a61d4..ebdf67ca7a160 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "overmind"; - version = "2.4.0"; + version = "2.5.1"; nativeBuildInputs = [ makeWrapper ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE="; + sha256 = "sha256-wX29nFmzmbxbaXtwIWZNvueXFv9SKIOqexkc5pEITpw="; }; - vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4="; + vendorHash = "sha256-XhF4oizOZ6g0351Q71Wp9IA3aFpocC5xGovDefIoL78="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix deleted file mode 100644 index 44a711dfeec17..0000000000000 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, nix-update-script -, fetchFromGitHub -, rustPlatform -, pkg-config -, installShellFiles -, zstd -, openssl -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "owmods-cli"; - version = "0.12.2"; - - src = fetchFromGitHub { - owner = "ow-mods"; - repo = "ow-mod-man"; - rev = "cli_v${version}"; - hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; - }; - - cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; - - nativeBuildInputs = [ - pkg-config - installShellFiles - ]; - - buildInputs = [ - zstd - ] ++ lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - buildAndTestSubdir = "owmods_cli"; - - postInstall = '' - cargo xtask dist_cli - installManPage man/man*/* - installShellCompletion --cmd owmods \ - dist/cli/completions/owmods.{bash,fish,zsh} - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "CLI version of the mod manager for Outer Wilds Mod Loader"; - homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_cli"; - downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/cli_v${version}"; - mainProgram = "owmods"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ locochoco ]; - }; -} diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 5952345ec1c7c..6e97bad8f913b 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.1"; + version = "0.6.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-cUM9+6BZcsrb850fm5mFWpo7/JmxwNDh+upHeE7+DU8="; + sha256 = "sha256-pHyIL5Jmldsa0ZNMiYpBD+9zxPv8Blg23nnWD2YmHMI="; }; - cargoHash = "sha256-sFBI/+7oGjjUyr3PBkkqdgprGdcaYHtOvqFpkrF4Qx8="; + cargoHash = "sha256-N1Cv89njL9QCIs3HclcjsqgSUSMEckis8zyVqepeW70="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 35fe84b22729b..d1ae9f68270ec 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -14,26 +14,26 @@ let - wasm-bindgen-84 = wasm-bindgen-cli.override { - version = "0.2.84"; - hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; - cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + wasm-bindgen-92 = wasm-bindgen-cli.override { + version = "0.2.92"; + hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; + cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; }; in rustPlatform.buildRustPackage rec { pname = "pagefind"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "cloudcannon"; repo = "pagefind"; rev = "refs/tags/v${version}"; - hash = "sha256-IN+l5Wq89tjppE0xCcvczQSkJc1CLymEFeieJhvQQ54="; + hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M="; }; - cargoHash = "sha256-T7DBuqfpqaEmu9iItnFYsJVnEFxG1r9uXEkfqJp1mD8="; + cargoHash = "sha256-E4gjG5GrVWkMKgjQiAvEiSy2/tx/yHKe+5isveMZ9tU="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; @@ -50,6 +50,11 @@ rustPlatform.buildRustPackage rec { src = "${src}/pagefind_ui/modular"; hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4="; }; + env.cargoDeps_web = rustPlatform.fetchCargoTarball { + name = "cargo-deps-web"; + src = "${src}/pagefind_web/"; + hash = "sha256-vDkVXyDePKgYTYE5ZTLLfOHwPYfgaqP9p5/fKCQQi0g="; + }; postPatch = '' # Tricky way to run npmConfigHook multiple times @@ -60,6 +65,11 @@ rustPlatform.buildRustPackage rec { npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook ) + ( + cd pagefind_web + cargoDeps=$cargoDeps_web cargoSetupPostUnpackHook + cargoDeps=$cargoDeps_web cargoSetupPostPatchHook + ) ''; nativeBuildInputs = [ @@ -68,7 +78,7 @@ rustPlatform.buildRustPackage rec { nodejs rustc rustc.llvmPackages.lld - wasm-bindgen-84 + wasm-bindgen-92 wasm-pack ]; @@ -76,22 +86,27 @@ rustPlatform.buildRustPackage rec { # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml preBuild = '' export HOME=$(mktemp -d) + + echo entering pagefind_web_js... ( cd pagefind_web_js npm run build-coupled ) + echo entering pagefind_web... ( cd pagefind_web export RUSTFLAGS="-C linker=lld" bash ./local_build.sh ) + echo entering pagefind_ui/default... ( cd pagefind_ui/default npm run build ) + echo entering pagefind_ui/modular... ( cd pagefind_ui/modular npm run build diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index 602c366c12a4f..e6c250afc321b 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -27,11 +27,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_91a"; + version = "150_93b"; src = fetchurl { - url = "https://web.archive.org/web/20231209190803if_/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-/qugI7k0NYpq7p9l9auD2Pp+SFoFZ9jAZswpreVfgO4="; + url = "https://web.archive.org/web/20240329180120/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-wfsauQMubnGKGfL9c0Zee5g3nn0eEnOFalQNL3d4weE="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/applications/misc/passky-desktop/default.nix index 927035ed8167d..26f5debecacdf 100644 --- a/pkgs/applications/misc/passky-desktop/default.nix +++ b/pkgs/applications/misc/passky-desktop/default.nix @@ -1,24 +1,30 @@ { lib , stdenv , fetchFromGitHub -, electron_22 +, electron_29 , makeWrapper , makeDesktopItem , copyDesktopItems }: +let + electron = electron_29; +in stdenv.mkDerivation rec { pname = "passky-desktop"; - version = "8.1.1"; + version = "8.1.2"; src = fetchFromGitHub { owner = "Rabbit-Company"; repo = "Passky-Desktop"; rev = "refs/tags/v${version}"; - sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr"; + sha256 = "sha256-QQ0+qIkDPNCHeWmcF6FkbDrrt/r3fIkNi0dv6XlV1rc="; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; installPhase = '' runHook preInstall @@ -35,7 +41,7 @@ stdenv.mkDerivation rec { done mkdir "$out/share/applications" - makeWrapper ${electron_22}/bin/electron "$out/bin/passky" \ + makeWrapper ${electron}/bin/electron "$out/bin/passky" \ --add-flags "$out/share/passky/electron/" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -45,12 +51,13 @@ stdenv.mkDerivation rec { desktopItems = [ ( makeDesktopItem { - name = "Passky"; + name = "passky"; type = "Application"; - desktopName = "passky"; + desktopName = "Passky"; comment = "Simple, modern, open source and secure password manager."; icon = "passky"; exec = "passky %U"; + terminal = false; categories = [ "Utility" ]; startupWMClass = "Passky"; } diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 9e36bba669617..7d46836b796e4 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -41,9 +41,15 @@ stdenv.mkDerivation rec { url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff"; hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU="; }) + # Allow compiling with markdown3 + # https://github.com/pdfpc/pdfpc/pull/716 + (fetchpatch { + url = "https://github.com/pdfpc/pdfpc/commit/08e66b9d432e9598c1ee9a78b2355728036ae1a1.patch"; + hash = "sha256-SKH2GQ5/6Is36xOFmSs89Yw/w7Fnma3FrNqwjOlUQKM="; + }) ]; - cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { description = "A presenter console with multi-monitor support for PDF files"; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index fcc139bfa041a..05c641731c136 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -7,30 +7,50 @@ , qtwayland , qtsvg , postgresql +, cups +, libxml2 }: stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-9/D5C3l3N15q+xP9lLAcdT+1+dEMcowBeR+DjE67fYQ="; + sha256 = "sha256-urKAsuYmK8dsXhP+I7p27PXXYRapPtkI8FqARfLwnEw="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; + qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.isDarwin [ + "PGSQL_INC=${postgresql}/include" + "PGSQL_LIB=${postgresql.lib}/lib/libpq.dylib" + "XML_INC=${libxml2.dev}/include/libxml2" + "XML_LIB=${libxml2.out}/lib/libxml2.dylib" + "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" + ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. - buildInputs = [ postgresql qtsvg qtwayland ]; + buildInputs = [ postgresql qtsvg ] + ++ lib.optionals stdenv.isLinux [ qtwayland ] + ++ lib.optionals stdenv.isDarwin [ cups libxml2 ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/bin + for item in pgmodeler pgmodeler-{cli,se,ch} + do + ln -s $out/Applications/pgModeler.app/Contents/MacOS/$item $out/bin + done + ''; + + dontWrapQtApps = stdenv.isDarwin; meta = with lib; { description = "A database modeling tool for PostgreSQL"; homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/applications/misc/plots/default.nix index 1e7db2651a106..c53a0a57beb3b 100644 --- a/pkgs/applications/misc/plots/default.nix +++ b/pkgs/applications/misc/plots/default.nix @@ -3,7 +3,7 @@ , python3Packages , gobject-introspection , libadwaita -, wrapGAppsHook +, wrapGAppsHook4 , lmmath }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw="; }; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook4 ]; buildInputs = [ libadwaita ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix index 3fbf063e73150..f20ab86c85c90 100644 --- a/pkgs/applications/misc/pop/default.nix +++ b/pkgs/applications/misc/pop/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8="; - GOWORK = "off"; + env.GOWORK = "off"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/pot/Cargo.lock b/pkgs/applications/misc/pot/Cargo.lock deleted file mode 100644 index a8dcf7612e3ab..0000000000000 --- a/pkgs/applications/misc/pot/Cargo.lock +++ /dev/null @@ -1,7348 +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 = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "const-random", - "getrandom 0.2.11", - "once_cell", - "version_check", - "zerocopy", -] - -[[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 = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "arboard" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" -dependencies = [ - "clipboard-win", - "core-graphics 0.22.3", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot", - "thiserror", - "winapi", - "x11rb", -] - -[[package]] -name = "ascii" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" - -[[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.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" -dependencies = [ - "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" -dependencies = [ - "async-lock 3.1.2", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.0.1", - "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 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" -dependencies = [ - "async-lock 3.1.2", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite 2.0.1", - "parking", - "polling 3.3.1", - "rustix 0.38.25", - "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.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" -dependencies = [ - "event-listener 4.0.0", - "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.25", - "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.39", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.2.1", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.25", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[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.39", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", -] - -[[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.2.0", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atomic-write-file" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae364a6c1301604bbc6dfbf8c385c47ff82301dd01eef506195a029196d8d04" -dependencies = [ - "nix 0.27.1", - "rand 0.8.5", -] - -[[package]] -name = "auto-launch" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" -dependencies = [ - "dirs 4.0.0", - "thiserror", - "winreg 0.10.1", -] - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.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 = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[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.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] - -[[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.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel", - "async-lock 3.1.2", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite 2.0.1", - "piper", - "tracing", -] - -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byte-unit" -version = "4.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" -dependencies = [ - "serde", - "utf8-width", -] - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" -dependencies = [ - "serde", -] - -[[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.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.0", -] - -[[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 = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "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.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "chunked_transfer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[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", -] - -[[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 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.23.1", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-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 = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway", - "cfg-if", - "itoa 1.0.9", - "ryu", - "static_assertions", -] - -[[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 = "const-oid" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" - -[[package]] -name = "const-random" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom 0.2.11", - "once_cell", - "tiny-keccak", -] - -[[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 = "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 = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.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", - "crossbeam-utils", -] - -[[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 = "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 = "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.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.39", -] - -[[package]] -name = "cstr" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.39", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2", - "quote", - "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", - "proc-macro2", - "quote", - "rustc_version", - "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", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "digest_auth" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3054f4e81d395e50822796c5e99ca522e6ba7be98947d6d4b0e5e61640bdb894" -dependencies = [ - "digest", - "hex", - "md-5", - "rand 0.8.5", - "sha2", -] - -[[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", - "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", -] - -[[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", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "display-info" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9fb6a73233755f827129d80a80a6a16448122040537c881248a09d5c80ab6b" -dependencies = [ - "anyhow", - "core-graphics 0.23.1", - "fxhash", - "widestring", - "windows 0.48.0", - "xcb", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.1", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[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 = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "winapi", - "wio", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" -dependencies = [ - "serde", -] - -[[package]] -name = "embed-resource" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" -dependencies = [ - "cc", - "rustc_version", - "toml 0.8.8", - "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.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enigo" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802e4b2ae123615659085369b453cba87c5562e46ed8050a909fee18a9bc3157" -dependencies = [ - "core-graphics 0.23.1", - "libc", - "objc", - "pkg-config", - "windows 0.51.1", -] - -[[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.39", -] - -[[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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "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 = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" -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.0", - "pin-project-lite", -] - -[[package]] -name = "exr" -version = "1.71.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "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 = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "log", -] - -[[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 = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[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-ord" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font-kit" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0504fc23a34d36352540ae5eedcec2623c86607a4efe25494ca9641845c5a50" -dependencies = [ - "bitflags 2.4.1", - "byteorder", - "core-foundation", - "core-graphics 0.22.3", - "core-text", - "dirs-next", - "dwrote", - "float-ord", - "freetype", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi", - "yeslogic-fontconfig-sys", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fraction" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a78dd758a47a7305478e0e054f9fde4e983b9f9eccda162bf7ca03b79e9d40" -dependencies = [ - "lazy_static", - "num", -] - -[[package]] -name = "freetype" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" -dependencies = [ - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[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-channel" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" - -[[package]] -name = "futures-executor" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[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.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" -dependencies = [ - "fastrand 2.0.1", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" - -[[package]] -name = "futures-util" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" -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 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.0", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.2.0", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.2.0", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.2.0", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" -dependencies = [ - "libc", - "winapi", -] - -[[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.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags 1.3.2", - "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.2.0", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags 1.3.2", - "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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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.2.0", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.0", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.2.0", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.1.0", - "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" - -[[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 = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[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" -dependencies = [ - "unicode-segmentation", -] - -[[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 = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - -[[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.109", -] - -[[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.109", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.9", -] - -[[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.9", - "pin-project-lite", - "socket2 0.4.10", - "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 0.51.1", -] - -[[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.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.3", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[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", - "quote", -] - -[[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.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", - "serde", -] - -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - -[[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 = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - -[[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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" -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 = "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 = "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.3", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[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 0.7.4", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "cc", - "pkg-config", -] - -[[package]] -name = "libloader" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d39e73d63036eb973937a3d247e8c9799b1cd0e131079ae8aba294cb0328073" -dependencies = [ - "libloading 0.7.4", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "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 = "lingua" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73989d32b4cd00a69e78d979203fa3b87e43fae0236a29544331c2ccfa180fdd" -dependencies = [ - "ahash", - "brotli", - "compact_str", - "fraction", - "include_dir", - "itertools 0.12.0", - "lingua-arabic-language-model", - "lingua-bokmal-language-model", - "lingua-chinese-language-model", - "lingua-english-language-model", - "lingua-french-language-model", - "lingua-german-language-model", - "lingua-hindi-language-model", - "lingua-indonesian-language-model", - "lingua-italian-language-model", - "lingua-japanese-language-model", - "lingua-korean-language-model", - "lingua-malay-language-model", - "lingua-mongolian-language-model", - "lingua-nynorsk-language-model", - "lingua-persian-language-model", - "lingua-portuguese-language-model", - "lingua-russian-language-model", - "lingua-spanish-language-model", - "lingua-thai-language-model", - "lingua-turkish-language-model", - "lingua-vietnamese-language-model", - "maplit", - "once_cell", - "rayon", - "regex", - "serde", - "serde-wasm-bindgen", - "serde_json", - "strum", - "strum_macros", - "wasm-bindgen", -] - -[[package]] -name = "lingua-arabic-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ada75100728990b05bacaec7693efebf0c8b911599ac0c082cb4ed576bf494d" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-bokmal-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9215ee6bbe6d37222dc5dbd9d1577389810011cb8afbef6155e71a11fa5cb9" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-chinese-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a1e3a38a0920f6ddbd9b6a79a8c04cd927142713b595ba32be6b811603f7c6" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-english-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd066693abb10083bb5b5fc1c494dda357170265021ad873ef582211817b8a8" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-french-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba406de05309b212790036e576aee4b1a71ce62b77fbd084df5bc8d7c624866f" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-german-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd4041d542b6512d415c0ea6979333e5e88698b966dda7b9bf06029bf690a13" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-hindi-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63659e514fa8c706d2ed0d7a04b98adb05b8c8d4bc37e3d12edb9d35ce24fd0" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-indonesian-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc06b8937f6adaad76b28fd009cbfaa6f876ebe5fa887d96dccd1dff2d21d9ad" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-italian-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6e138047ac4d681e419e37ad9e383878652ac19e67056ff16085d4cc82e590" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-japanese-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b34b94aa96a1bc0838ddda2c7912d0ebd7256bb21e7a2974e4dd8b186df501a8" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-korean-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c47aa5e5dc8d029967375081aabda462faf10b070aefc1a175ea7f42f5267c" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-malay-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771c6b7ab2865e2563e1ce19bf06611aad674c3f0a180ec43c03a9883e49c8aa" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-mongolian-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53de502920af44b5d8ec7787895c0a81b0f5f43e3f3c2b80a240f2b605122c1" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-nynorsk-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db00b13561df244acb76927677200ff399b02d8c9b160d25a38320ef3361cfa9" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-persian-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043ba9b4ac7df99acaa1cd9f5925d6fc9b0fe850d3891bbeb91b27ed94f266c4" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-portuguese-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df0be307b3f5e24e10e76a7841302c0ff4a6ebf818a11d3a3c5c4cecfcfe58b" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-russian-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea97d6643e90ee4fc0043c728f0c06cdd9e69d4970fd1983e5c59b3448a676e" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-spanish-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45be9bede9b9d6d53b6e06047822a18dbd83e5d515736afecd85c1e71cc6070" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-thai-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194b09209fc63d986d8ef9505689756eff1935fa52fd91031b60e7d546ca3c76" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-turkish-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b517e12fe94ce80e7f8f380fdd2c0223bcfe351c0898c9a83f56f78b3afad81" -dependencies = [ - "include_dir", -] - -[[package]] -name = "lingua-vietnamese-language-model" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d08afaf263906aa3f2bfaffaf52eecd368992685e2468f1ba7f85f3e41fd49" -dependencies = [ - "include_dir", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "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.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", - "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.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "macos-accessibility-client" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf7710fbff50c24124331760978fb9086d6de6288dcdb38b25a97f8b1bdebbb" -dependencies = [ - "core-foundation", - "core-foundation-sys", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[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.6.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", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[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 = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[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.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[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 = "mouse_position" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd272ac3ad817af3d158eecd4d4ba6f92a1fa5f7255e3c0d63b72d4dac12edd" -dependencies = [ - "core-graphics 0.22.3", - "winapi", - "x11-dl", -] - -[[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 1.3.2", - "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 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "7.1.3" -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.4.1", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "serde", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "notify-debouncer-mini" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43" -dependencies = [ - "crossbeam-channel", - "log", - "notify", - "serde", -] - -[[package]] -name = "notify-rust" -version = "4.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" -dependencies = [ - "log", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - -[[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" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-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-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "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.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[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.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[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.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-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.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_pipe" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" -dependencies = [ - "libc", - "windows-sys 0.48.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 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.0", -] - -[[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 0.4.1", - "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 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pathfinder_geometry" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" -dependencies = [ - "log", - "pathfinder_simd", -] - -[[package]] -name = "pathfinder_simd" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0444332826c70dc47be74a7c6a5fc44e23a7905ad6858d4162b658320455ef93" -dependencies = [ - "rustc_version", -] - -[[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 = "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" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.1.0", -] - -[[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.109", -] - -[[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.109", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64 0.21.5", - "indexmap 2.1.0", - "line-wrap", - "quick-xml 0.31.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[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.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.25", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "pot" -version = "0.0.0" -dependencies = [ - "arboard", - "base64 0.21.5", - "dirs 5.0.1", - "font-kit", - "image", - "libloader", - "libloading 0.8.1", - "lingua", - "log", - "macos-accessibility-client", - "mouse_position", - "once_cell", - "reqwest", - "reqwest_dav", - "screenshots", - "selection", - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-autostart", - "tauri-plugin-fs-watch", - "tauri-plugin-log", - "tauri-plugin-single-instance", - "tauri-plugin-sql", - "tauri-plugin-store", - "thiserror", - "tiny_http", - "walkdir", - "window-shadows", - "windows 0.44.0", - "zip", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[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-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" -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 = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -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.11", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[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 = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom 0.2.11", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[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", - "mime_guess", - "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 = "reqwest_dav" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b567143a5c9b806f8f3a7a13f18e2517fd95da6f8daf2c22525b43992c64d4b" -dependencies = [ - "async-trait", - "chrono", - "digest_auth", - "http", - "reqwest", - "serde", - "serde-xml-rs", - "serde_derive", - "serde_json", - "tokio", - "url", -] - -[[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 = "rsa" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", -] - -[[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 = "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.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "screenshots" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2e9c30ca7f738a53367336d820f4a9af213c706ea55266d608d38e3b5cbff" -dependencies = [ - "anyhow", - "core-graphics 0.22.3", - "dbus", - "display-info", - "fxhash", - "percent-encoding", - "png", - "widestring", - "windows 0.48.0", - "xcb", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selection" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4c5f3c0a904e16c649b1c59e95bda2d0983334a7b836b3aa4a85430831af16" -dependencies = [ - "arboard", - "enigo", - "log", - "windows 0.52.0", - "wl-clipboard-rs", - "x11-clipboard", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] -name = "serde-xml-rs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" -dependencies = [ - "log", - "serde", - "thiserror", - "xml-rs", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa 1.0.9", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[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.9", - "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.3", - "indexmap 2.1.0", - "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.39", -] - -[[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.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -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 = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "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-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags 1.3.2", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[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 = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sqlformat" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" -dependencies = [ - "itertools 0.11.0", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener 2.5.3", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.1.0", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "time", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" -dependencies = [ - "atomic-write-file", - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" -dependencies = [ - "atoi", - "base64 0.21.5", - "bitflags 2.4.1", - "byteorder", - "bytes", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa 1.0.9", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand 0.8.5", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "time", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" -dependencies = [ - "atoi", - "base64 0.21.5", - "bitflags 2.4.1", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa 1.0.9", - "log", - "md-5", - "memchr", - "once_cell", - "rand 0.8.5", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "time", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "time", - "tracing", - "url", - "urlencoding", -] - -[[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 = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[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 = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.39", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -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 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" -dependencies = [ - "cfg-expr 0.15.5", - "heck 0.4.1", - "pkg-config", - "toml 0.8.8", - "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 1.3.2", - "cairo-rs", - "cc", - "cocoa 0.24.1", - "core-foundation", - "core-graphics 0.22.3", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "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.109", -] - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" - -[[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 0.24.1", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.1", - "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", - "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.1", - "json-patch", - "semver", - "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", - "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.1", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin-autostart" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "auto-launch", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-plugin-fs-watch" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "log", - "notify", - "notify-debouncer-mini", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-plugin-log" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "byte-unit", - "fern", - "log", - "serde", - "serde_json", - "serde_repr", - "tauri", - "time", -] - -[[package]] -name = "tauri-plugin-single-instance" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "windows-sys 0.52.0", - "zbus", -] - -[[package]] -name = "tauri-plugin-sql" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "futures-core", - "log", - "serde", - "serde_json", - "sqlx", - "tauri", - "thiserror", - "time", - "tokio", -] - -[[package]] -name = "tauri-plugin-store" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b2e9ab6c9b853a861292c69770458e5409992c0" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[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 0.24.1", - "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.1", - "html5ever 0.26.0", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver", - "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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" -dependencies = [ - "quick-xml 0.30.0", - "windows 0.51.1", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.25", - "windows-sys 0.48.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 = "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.39", -] - -[[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 = "tiff" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa 1.0.9", - "libc", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tiny_http" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" -dependencies = [ - "ascii", - "chunked_transfer", - "httpdate", - "log", -] - -[[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.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2 0.5.5", - "windows-sys 0.48.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-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "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", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.21.0", -] - -[[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.1.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" -dependencies = [ - "indexmap 2.1.0", - "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.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[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 = "tree_magic_mini" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" -dependencies = [ - "bytecount", - "fnv", - "lazy_static", - "nom", - "once_cell", - "petgraph", -] - -[[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.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[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 = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[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", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "utf-8" -version = "0.7.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" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" -dependencies = [ - "getrandom 0.2.11", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.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.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[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 = "wayland-backend" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" -dependencies = [ - "cc", - "downcast-rs", - "nix 0.26.4", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" -dependencies = [ - "bitflags 2.4.1", - "nix 0.26.4", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" -dependencies = [ - "bitflags 2.4.1", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.4.1", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" -dependencies = [ - "proc-macro2", - "quick-xml 0.30.0", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" -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 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.2.0", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -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 = "window-shadows" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ff424735b1ac21293b0492b069394b0a189c8a463fb015a16dea7c2e221c08" -dependencies = [ - "cocoa 0.25.0", - "objc", - "raw-window-handle", - "windows-sys 0.48.0", -] - -[[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" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.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-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.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.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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -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", -] - -[[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_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[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_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.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_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[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_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.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_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" -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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[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 = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[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 = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "wl-clipboard-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa" -dependencies = [ - "derive-new", - "libc", - "log", - "nix 0.26.4", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", -] - -[[package]] -name = "wry" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa 0.24.1", - "core-graphics 0.22.3", - "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.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-clipboard" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41aca1115b1f195f21c541c5efb423470848d48143127d0f07f8b90c27440df" -dependencies = [ - "x11rb", -] - -[[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.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" -dependencies = [ - "gethostname", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xcb" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3acf6b0945550d37d3a683b8f7de9d9f66b2c14dc390313b34d7ac6f1b4089" -dependencies = [ - "bitflags 1.3.2", - "libc", - "quick-xml 0.28.2", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix 0.26.4", - "winapi", -] - -[[package]] -name = "xml-rs" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" - -[[package]] -name = "yeslogic-fontconfig-sys" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb6b23999a8b1a997bf47c7bb4d19ad4029c3327bb3386ebe0a5ff584b33c7a" -dependencies = [ - "cstr", - "dlib", - "once_cell", - "pkg-config", -] - -[[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 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 0.26.4", - "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.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 = "zerocopy" -version = "0.7.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[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", -] - -[[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-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "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.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.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/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix deleted file mode 100644 index fdc0a6b6c4149..0000000000000 --- a/pkgs/applications/misc/pot/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib -, stdenv -, stdenvNoCC -, rustPlatform -, fetchFromGitHub -, wrapGAppsHook -, cargo -, rustc -, cargo-tauri -, pkg-config -, nodePackages -, esbuild -, buildGoModule -, jq -, moreutils -, libayatana-appindicator -, gtk3 -, webkitgtk -, libsoup -, openssl -, xdotool -, cacert -}: - -stdenv.mkDerivation rec { - pname = "pot"; - version = "2.7.4"; - - src = fetchFromGitHub { - owner = "pot-app"; - repo = "pot-desktop"; - rev = version; - hash = "sha256-c7FHkp/utvrr7qasY+XKaTnPaiZWb8M5EGiFne52osQ="; - }; - - sourceRoot = "${src.name}/src-tauri"; - - postPatch = '' - substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - ''; - - pnpm-deps = stdenvNoCC.mkDerivation { - pname = "${pname}-pnpm-deps"; - inherit src version; - - nativeBuildInputs = [ - jq - moreutils - nodePackages.pnpm - cacert - ]; - - installPhase = '' - export HOME=$(mktemp -d) - pnpm config set store-dir $out - # use --ignore-script and --no-optional to avoid downloading binaries - # use --frozen-lockfile to avoid checking git deps - pnpm install --frozen-lockfile --no-optional --ignore-script - - # Remove timestamp and sort the json files - rm -rf $out/v3/tmp - for f in $(find $out -name "*.json"); do - sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f - jq --sort-keys . $f | sponge $f - done - ''; - - dontFixup = true; - outputHashMode = "recursive"; - outputHash = "sha256-BQ5M+pKEXGJzWmxMchNgxpvLpgFCRIg33GQCvO4TLz4="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - # All other crates in the same workspace reuse this hash. - "tauri-plugin-autostart-0.0.0" = "sha256-/uxaSBp+N1VjjSiwf6NwNnSH02Vk6gQZ/CzO+AyEI7o="; - }; - }; - - nativeBuildInputs = [ - rustPlatform.cargoSetupHook - cargo - rustc - cargo-tauri - wrapGAppsHook - nodePackages.pnpm - pkg-config - ]; - - buildInputs = [ - gtk3 - libsoup - libayatana-appindicator - openssl - webkitgtk - xdotool - ]; - - ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.18.20"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - })}"; - - preBuild = '' - export HOME=$(mktemp -d) - pnpm config set store-dir ${pnpm-deps} - chmod +w .. - pnpm install --offline --frozen-lockfile --no-optional --ignore-script - chmod -R +w ../node_modules - pnpm rebuild - # Use cargo-tauri from nixpkgs instead of pnpm tauri from npm - cargo tauri build -b deb - ''; - - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - ''; - - meta = with lib; { - description = "A cross-platform translation software"; - mainProgram = "pot"; - homepage = "https://pot.pylogmon.com"; - platforms = platforms.linux; - license = licenses.gpl3Only; - maintainers = with maintainers; [ linsui ]; - }; -} - diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 8c621dcd9b7a3..86258fa9805dc 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 = "0.88.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-YiBo6p+eB7lY6ey/S/Glfj3egi1jL4Gjs681nTxEjE8="; + hash = "sha256-juFcVtHhqT6tw9YaKCDTUvX6NqqxEjqVK3Zom673IkQ="; # 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-KtktEq/5V/YE6VtWprUei0sIcwcirju+Yxj1yTgWmYY="; + vendorHash = "sha256-9G8GPTJRuPahNcEhAddZsUKc1fexp6IrCZlCGKW0T64="; doCheck = false; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 661bbd22be856..3bd280766b16d 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages }: stdenv.mkDerivation rec { pname = "procmail"; @@ -30,8 +30,19 @@ stdenv.mkDerivation rec { sed -e "3i\ .PHONY: install " -i Makefile + '' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + substituteInPlace src/Makefile.0 \ + --replace-fail '@./_autotst' '@${stdenv.hostPlatform.emulator buildPackages} ./_autotst' + sed -e '3i\ + _autotst() { ${stdenv.hostPlatform.emulator buildPackages} ./_autotst "$@"; } \ + _locktst() { ${stdenv.hostPlatform.emulator buildPackages} ./_locktst "$@"; } \ + ' -i src/autoconf ''; + # default target is binaries + manpages; manpages don't cross compile without more work. + makeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "bins" ]; + installTargets = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ "install.bin" ]; + meta = with lib; { description = "Mail processing and filtering utility"; homepage = "https://github.com/BuGlessRB/procmail/"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 0b5a5065cf120..7952eadea68fa 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -27,7 +27,7 @@ , openvdb , pcre , qhull -, tbb_2021_8 +, tbb_2021_11 , wxGTK32 , xorg , libbgcode @@ -61,17 +61,17 @@ let hash = "sha256-WNdAYu66ggpSYJ8Kt57yEA4mSTv+Rvzj9Rm1q765HpY="; }; }); - openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_8; }; + openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; }; wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.7.2"; + version = "2.7.4"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-IZRw6qEe4hM/Sfhx0je11vaMHeuW/e4ZP5zMTuptb2k="; + hash = "sha256-g2I2l6i/8p8werDs4mDI/lGeDQsma4WSB9vT6OB2LGg="; rev = "version_${finalAttrs.version}"; }; @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { openvdb_tbb_2021_8 pcre qhull - tbb_2021_8 + tbb_2021_11 wxGTK-override' xorg.libX11 libbgcode @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "G-code generator for 3D printer"; homepage = "https://github.com/prusa3d/PrusaSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; } // lib.optionalAttrs (stdenv.isDarwin) { diff --git a/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch b/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch new file mode 100644 index 0000000000000..7013314779d44 --- /dev/null +++ b/pkgs/applications/misc/prusa-slicer/meshboolean-const.patch @@ -0,0 +1,19 @@ +diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp +index 31fdc35..32acbf8 100644 +--- a/src/libslic3r/MeshBoolean.cpp ++++ b/src/libslic3r/MeshBoolean.cpp +@@ -147,12 +147,12 @@ template<class _Mesh> TriangleMesh cgal_to_triangle_mesh(const _Mesh &cgalmesh) + const auto &vertices = cgalmesh.vertices(); + int vsize = int(vertices.size()); + +- for (auto &vi : vertices) { ++ for (const auto &vi : vertices) { + auto &v = cgalmesh.point(vi); // Don't ask... + its.vertices.emplace_back(to_vec3f(v)); + } + +- for (auto &face : faces) { ++ for (const auto &face : faces) { + auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); + + int i = 0; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 88423e36a9565..218fe6f96bf38 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -16,6 +16,7 @@ let ]; sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) + ./meshboolean-const.patch ]; versions = { @@ -81,7 +82,7 @@ let meta = with lib; { inherit description; homepage = "https://github.com/supermerill/SuperSlicer"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ cab404 moredread tmarkus ]; mainProgram = "superslicer"; }; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 7e158853966bd..69483be06db65 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "3.3.3"; + version = "3.4.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = "pueue"; rev = "v${version}"; - hash = "sha256-Q1x97eJNjtET+L3KpWTXLKbz62XgkjxNZkAAZWhbMmM="; + hash = "sha256-kKu/+F+zK0UyRHGkrZdD8alvsQTZFHhTqYK2phxo/ZA="; }; - cargoHash = "sha256-i9SPOZo9AuITm6iI++D3ipY8c0xfZzkeHW7tb9SZ3iQ="; + cargoHash = "sha256-KwIGJiCGcFEKuloVtJr0GQxoFQVt/OHyJ/YCp4bCSGc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 840d1a89b94f5..159b7683e823c 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,30 +1,22 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev -, qtmultimedia, qtscript, alsa-lib, ola, libftdi1, libusb-compat-0_1 +, qtmultimedia, qtscript, qtserialport, alsa-lib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: mkDerivation rec { pname = "qlcplus"; - version = "4.12.3"; + version = "4.13.0"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; + sha256 = "11av9hg6l0pb1lmlw35v1v2q9mmqz65yfaq01454y5qlmsbxpgkp"; }; - patches = [ - (fetchpatch { - name = "qt5.15-deprecation-fixes.patch"; - url = "https://github.com/mcallegari/qlcplus/commit/e4ce4b0226715876e8e9e3b23785d43689b2bb64.patch"; - sha256 = "1zhrg6ava1nyc97xcx75r02zzkxmar0973w4jwkm5ch3iqa8bqnh"; - }) - ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ - udev qtmultimedia qtscript alsa-lib ola libftdi1 libusb-compat-0_1 libsndfile libmad + udev qtmultimedia qtscript qtserialport alsa-lib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index c0530dfe78e30..0439e212d1122 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,32 +1,65 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo -, qtmultimedia, qttools, qtwebengine, wrapQtAppsHook }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, ninja +, qttools +, qtwebengine +, wrapQtAppsHook +}: -stdenv.mkDerivation rec { +let + eb = fetchFromGitHub { + owner = "mvf"; + repo = "eb"; + rev = "58e1c3bb9847ed5d05863f478f21e7a8ca3d74c8"; + hash = "sha256-gZP+2P6fFADWht2c0hXmljVJQX8RpCq2mWP+KDi+GzE="; + }; +in + +stdenv.mkDerivation { pname = "qolibri"; - version = "2.1.4"; + version = "2.1.5-unstable-2024-03-17"; src = fetchFromGitHub { - owner = "ludios"; + owner = "mvf"; repo = "qolibri"; - rev = version; - sha256 = "jyLF1MKDVH0Lt8lw+O93b+LQ4J+s42O3hebthJk83hg="; + rev = "99f0771184fcb2c5f47aad11c16002ebb8469a3f"; + hash = "sha256-ArupqwejOO2YK9a3Ky0j20dIHs1jIqJksNIb4K2jwgI="; }; - nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + ninja + qttools + wrapQtAppsHook + ]; + buildInputs = [ - libeb lzo qtmultimedia qtwebengine + qtwebengine + ]; + + cmakeFlags = [ + "-DQOLIBRI_EB_SOURCE_DIR=${eb}" ]; postInstall = '' - install -D $src/qolibri.desktop -t $out/share/applications + install -Dm644 $src/qolibri.desktop -t $out/share/applications + + for size in 16 32 48 64 128; do + install -Dm644 \ + $src/images/qolibri-$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/qolibri.png + done ''; meta = with lib; { - homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; - mainProgram = "qolibri"; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/mvf/qolibri"; license = licenses.gpl2; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem. + mainProgram = "qolibri"; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 26807bc42a1cd..ae26de760ee6d 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,18 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub +{ fetchFromGitHub, lib, stdenv , git, gnupg, pass, pwgen, qrencode -, fetchpatch -, qtbase, qtsvg, qttools, qmake +, qtbase, qtsvg, qttools, qmake, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qtpass"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { - owner = "IJHack"; - repo = "QtPass"; - rev = "v${version}"; - sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x"; + owner = "IJHack"; + repo = "QtPass"; + rev = "v${version}"; + sha256 = "sha256-oKLLmsuXD2Hb2LQ4tcJP2gpR6eLaM/JzDhRcRSpUPYI="; }; postPatch = '' @@ -22,17 +21,7 @@ mkDerivation rec { buildInputs = [ git gnupg pass qtbase qtsvg ]; - nativeBuildInputs = [ qmake qttools ]; - - patches = [ - # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. - # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. - (fetchpatch { - name = "qtpass-Dont-hardcode-pass-otp-usr-lib-path.patch"; - url = "https://github.com/IJHack/QtPass/commit/2ca9f0ec5a8d709c97a2433c5cd814040c82d4f3.patch"; - sha256 = "0ljlvqxvarrz2a4j71i66aflrxi84zirb6cg9kvygnvhvm1zbc7d"; - }) - ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` sandboxProfile = toString qtbase.__propagatedSandboxProfile; diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index afdc3c231418c..fd882b3b572c6 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-6cpHDwnxdc/9YPj77JVuT5ZDFjKkF6nBX4RgZr/9fFY="; + vendorHash = "sha256-L8mDs9teQJW6P3dhKSLfzbpA7kzhJk61oR2q0ME+u0M="; # tests try to access the internet to scrape websites doCheck = false; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 71be8f8b157d3..ff0ba6c0edb7a 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -24,6 +24,8 @@ let ./575.patch ]; + strictDeps = true; + nativeBuildInputs = [ autoconf automake @@ -34,6 +36,7 @@ let wrapGAppsHook wrapPython gobject-introspection + python ]; configureFlags = [ @@ -49,7 +52,6 @@ let buildInputs = [ gtk3 - python ] ++ lib.optional withRandr libxcb ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index 2afbb2c505e44..585f7443ec476 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.14.13"; + version = "1.15.4"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-WpNgdQGNz1Vv3MQe6tgnkzf+rvxMeoDQns5SqKNP7F8="; + hash = "sha256-6WBdTOj/seinx1wJGb/4if3PzCPmtzHyNAFmQwmsrvE="; }; appexec = appimageTools.wrapType2 { diff --git a/pkgs/applications/misc/retool/default.nix b/pkgs/applications/misc/retool/default.nix deleted file mode 100644 index 8d7811120979b..0000000000000 --- a/pkgs/applications/misc/retool/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, python3 -, fetchFromGitHub -, qt6 -}: - -python3.pkgs.buildPythonApplication { - pname = "retool"; - version = "unstable-2023-08-24"; - - format = "pyproject"; - disabled = python3.pkgs.pythonOlder "3.10"; - - src = fetchFromGitHub { - owner = "unexpectedpanda"; - repo = "retool"; - rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; - hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; - }; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - qt6.wrapQtAppsHook - ]; - - pythonRelaxDeps = true; - - # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) - # ERROR: No matching distribution found for PySide6 - pythonRemoveDeps = [ "PySide6" ]; - - buildInputs = [ - qt6.qtbase - ] ++ - lib.optionals (stdenv.isLinux) [ - qt6.qtwayland - ]; - - propagatedBuildInputs = with python3.pkgs; [ - alive-progress - lxml - psutil - validators - pyside6 - strictyaml - ]; - - # Upstream has no tests - doCheck = false; - - meta = with lib; { - description = "A better filter tool for Redump and No-Intro dats"; - homepage = "https://github.com/unexpectedpanda/retool"; - license = licenses.bsd3; - maintainers = with maintainers; [ thiagokokada ]; - }; -} diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/applications/misc/revanced-cli/default.nix index 2d0629f5e171b..2037a20c3a2ee 100644 --- a/pkgs/applications/misc/revanced-cli/default.nix +++ b/pkgs/applications/misc/revanced-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "revanced-cli"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar"; - hash = "sha256-I25SmWUVJenFou1fKCd53PojoGt9FAQ7hDpEWweAICQ="; + hash = "sha256-QQH7aEkfBULqAvJ0FsKFxrraFjg1m1JJnuDtyvLJXEk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/rm-improved/Cargo.lock.patch b/pkgs/applications/misc/rm-improved/Cargo.lock.patch new file mode 100644 index 0000000000000..9905de7402c0e --- /dev/null +++ b/pkgs/applications/misc/rm-improved/Cargo.lock.patch @@ -0,0 +1,262 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 975cb99..f49f6ec 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,12 +1,29 @@ + # 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 = "ansi_term" +-version = "0.11.0" ++version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" + dependencies = [ +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] +@@ -17,54 +34,47 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ + "hermit-abi", + "libc", +- "winapi 0.3.8", ++ "winapi 0.3.9", + ] + + [[package]] + name = "backtrace" +-version = "0.3.44" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536" ++checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" + dependencies = [ +- "backtrace-sys", ++ "addr2line", ++ "cc", + "cfg-if", + "libc", ++ "miniz_oxide", ++ "object", + "rustc-demangle", + ] + +-[[package]] +-name = "backtrace-sys" +-version = "0.1.32" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-dependencies = [ +- "cc", +- "libc", +-] +- + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "cc" +-version = "1.0.50" ++version = "1.0.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + + [[package]] + name = "cfg-if" +-version = "0.1.10" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "2.33.0" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "ansi_term", + "atty", +@@ -77,19 +87,25 @@ dependencies = [ + + [[package]] + name = "error-chain" +-version = "0.12.2" ++version = "0.12.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" ++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" + dependencies = [ + "backtrace", + "version_check", + ] + + [[package]] +-name = "hermit-abi" +-version = "0.1.8" ++name = "gimli" ++version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" + dependencies = [ + "libc", + ] +@@ -106,19 +122,37 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.67" ++version = "0.2.153" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" ++checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + + [[package]] +-name = "redox_syscall" +-version = "0.1.56" ++name = "memchr" ++version = "2.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" ++dependencies = [ ++ "adler", ++] ++ ++[[package]] ++name = "object" ++version = "0.32.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" ++dependencies = [ ++ "memchr", ++] + + [[package]] + name = "rm-improved" +-version = "0.13.0" ++version = "0.13.1" + dependencies = [ + "clap", + "error-chain", +@@ -128,9 +162,9 @@ dependencies = [ + + [[package]] + name = "rustc-demangle" +-version = "0.1.16" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + + [[package]] + name = "same-file" +@@ -159,32 +193,32 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.1.42" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" + dependencies = [ + "libc", +- "redox_syscall", +- "winapi 0.3.8", ++ "wasi", ++ "winapi 0.3.9", + ] + + [[package]] + name = "unicode-width" +-version = "0.1.7" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + + [[package]] + name = "vec_map" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "version_check" +-version = "0.9.1" ++version = "0.9.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + + [[package]] + name = "walkdir" +@@ -197,6 +231,12 @@ dependencies = [ + "winapi 0.2.8", + ] + ++[[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" +@@ -205,9 +245,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" +-version = "0.3.8" ++version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/applications/misc/rm-improved/default.nix index be5fb6344494a..38fcfd3a339bd 100644 --- a/pkgs/applications/misc/rm-improved/default.nix +++ b/pkgs/applications/misc/rm-improved/default.nix @@ -2,22 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "rm-improved"; - version = "0.13.0"; - - cargoSha256 = "0wgpr6gx9dpvf02xgvrdbyiqfz1k9vipnvriz3jg0cz7n1afqisj"; + version = "0.13.1"; src = fetchFromGitHub { owner = "nivekuil"; repo = "rip"; - rev = "0.13.0"; - sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; + rev = version; + hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI="; }; + cargoHash = "sha256-05ebuPa8N+hz5BnqAdOCL6dnBqVsB9VN4HxfwL99gK0="; + + cargoPatches = [ + # Cargo.lock out-of-date + ./Cargo.lock.patch + ]; + meta = with lib; { description = "Replacement for rm with focus on safety, ergonomics and performance"; homepage = "https://github.com/nivekuil/rip"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ nils-degroot ]; mainProgram = "rip"; - license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 921ba4ddd9b32..ac8518e6a2d4f 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -6,6 +6,9 @@ , autoreconfHook , pkg-config +, waylandSupport ? true +, x11Support ? true + , cairo , glib , libnotify @@ -13,6 +16,8 @@ , wl-clipboard , xclip , xsel +, xdotool +, wtype }: stdenv.mkDerivation rec { @@ -38,9 +43,12 @@ stdenv.mkDerivation rec { 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 ]} + --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ] + ++ lib.optionals waylandSupport [ wtype ] + ++ lib.optionals x11Support [ xdotool ])} ''; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix deleted file mode 100644 index 7979232265468..0000000000000 --- a/pkgs/applications/misc/rofimoji/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ buildPythonApplication -, fetchFromGitHub -, lib -, python3 -, installShellFiles - -, waylandSupport ? true -, x11Support ? true - -, configargparse -, rofi -, wl-clipboard -, wtype -, xdotool -, xsel -}: - -buildPythonApplication rec { - pname = "rofimoji"; - version = "6.1.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "fdw"; - repo = "rofimoji"; - rev = "refs/tags/${version}"; - sha256 = "sha256-eyzdTMLW9nk0x74T/AhvoVSrxXugc1HgNJy8EB5BApE="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - installShellFiles - ]; - - # `rofi` and the `waylandSupport` and `x11Support` dependencies - # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ configargparse rofi ] - ++ optionals waylandSupport [ wl-clipboard wtype ] - ++ optionals x11Support [ xdotool xsel ]; - - # The 'extractors' sub-module is used for development - # and has additional dependencies. - postPatch = '' - rm -rf extractors - ''; - - postInstall = '' - installManPage src/picker/docs/rofimoji.1 - ''; - - meta = with lib; { - description = "A simple emoji and character picker for rofi"; - mainProgram = "rofimoji"; - homepage = "https://github.com/fdw/rofimoji"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ justinlovinger ]; - }; -} diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 9eb97113c37b5..256ed98f9a8cd 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -7,10 +7,10 @@ , desktopToDarwinBundle , webkitgtk_6_0 , sqlite -, gi-crystal , libadwaita , gtk4 , pango +, substituteAll }: let gtk4' = gtk4.override { x11Support = true; }; @@ -18,42 +18,40 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.2.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-IfI7jYM1bsrCq2NiANv/SWkCjPyT/HYUofJMUYy0Sbk="; + hash = "sha256-cloaGlHjtwrjuPGzAG55B58w307R+TO+MixAWTw2ags="; }; patches = [ # 1) fixed gi-crystal binding generator command - # 2) removed `-v` arg to `cp` command to prevent build failure due to stdout buffer overflow + # 2) fixed docset generator command # 3) added commands to build gschemas and update icon-cache - ./patches/make.patch - - # fixed docset path and gi libs directory names - ./patches/friendly-docs-path.patch - + (substituteAll { + src = ./make.patch; + inherit crystal; + }) # added chmod +w for copied docs to prevent error: # `Error opening file with mode 'wb': '.../style.css': Permission denied` - ./patches/enable-write-permissions.patch + ./enable-write-permissions.patch ]; postPatch = '' - substituteInPlace Makefile \ - --replace "crystal run src/create_crystal_docset.cr" "crystal src/create_crystal_docset.cr ${crystal}/share/doc/crystal/api/" \ - --replace "crystal run src/create_gtk_docset.cr" "crystal src/create_gtk_docset.cr gtk-doc/" + substituteInPlace src/doc2dash/create_gtk_docset.cr \ + --replace-fail 'basedir = Path.new("/usr/share/doc")' 'basedir = Path.new(ARGV[0]? || "gtk-docs")' ''; shardsFile = ./shards.nix; + copyShardDeps = true; nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - gi-crystal ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ @@ -86,6 +84,7 @@ crystal.buildCrystalPackage rec { description = "Dash/docset reader with built in documentation for Crystal and GTK APIs"; homepage = "https://github.com/hugopl/rtfm/"; license = licenses.mit; + mainProgram = "rtfm"; maintainers = with maintainers; [ sund3RRR ]; }; } diff --git a/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch b/pkgs/applications/misc/rtfm/enable-write-permissions.patch index efdabce083519..8023d647f782a 100644 --- a/pkgs/applications/misc/rtfm/patches/enable-write-permissions.patch +++ b/pkgs/applications/misc/rtfm/enable-write-permissions.patch @@ -1,5 +1,5 @@ ---- a/src/doc2dash/doc_set_builder.cr 2023-07-19 14:00:06.864770147 +0300 -+++ b/src/doc2dash/doc_set_builder.cr 2023-07-19 13:59:35.440707740 +0300 +--- a/src/doc2dash/docset_builder.cr 2024-04-20 10:45:32.000673168 +0300 ++++ b/src/doc2dash/docset_builder.cr 2024-04-20 10:45:56.072895349 +0300 @@ -44,6 +44,7 @@ real_dest = @html_dest.join(dest || source) Dir.mkdir_p(Path.new(real_dest).dirname) diff --git a/pkgs/applications/misc/rtfm/make.patch b/pkgs/applications/misc/rtfm/make.patch new file mode 100644 index 0000000000000..40f327193debf --- /dev/null +++ b/pkgs/applications/misc/rtfm/make.patch @@ -0,0 +1,39 @@ +--- a/Makefile 2024-04-20 10:28:36.697545022 +0300 ++++ b/Makefile 2024-04-20 10:37:55.591657540 +0300 +@@ -7,8 +7,10 @@ + shards build --debug -Dpreview_mt + + configure: +- shards install +- ./bin/gi-crystal ++ mkdir bin/ ++ cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug ++ cd ../.. ++ cp lib/gi-crystal/bin/gi-crystal bin/ && ./bin/gi-crystal + + rtfm: + shards build --release -Dpreview_mt rtfm +@@ -16,10 +18,10 @@ + docsets: crystal-docset gtk-docset + + crystal-docset: +- crystal run src/doc2dash/create_crystal_docset.cr ++ crystal src/doc2dash/create_crystal_docset.cr "@crystal@/share/doc/crystal/api" + + gtk-docset: +- crystal run src/doc2dash/create_gtk_docset.cr ++ crystal src/doc2dash/create_gtk_docset.cr "gtk-doc/" + + test: crystal-docset gtk-docset + crystal spec +@@ -28,8 +30,10 @@ + install -D -m 0755 bin/rtfm $(DESTDIR)$(PREFIX)/bin/rtfm + install -D -m 0644 data/io.github.hugopl.rtfm.desktop $(DESTDIR)$(PREFIX)/share/applications/io.github.hugopl.rtfm.desktop + install -D -m 0644 data/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/io.github.hugopl.rtfm.svg ++ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor + # Settings schema + install -D -m644 data/io.github.hugopl.rtfm.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/io.github.hugopl.rtfm.gschema.xml ++ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + # docsets + mkdir -p $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ + cp -r data/Crystal.docset $(DESTDIR)$(PREFIX)/share/rtfm/docsets/ diff --git a/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch b/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch deleted file mode 100644 index cecbeb750b300..0000000000000 --- a/pkgs/applications/misc/rtfm/patches/friendly-docs-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/create_gtk_docset.cr 2023-07-17 14:28:04.882620660 +0300 -+++ b/src/create_gtk_docset.cr 2023-07-17 14:27:09.660643747 +0300 -@@ -136,7 +136,7 @@ - end - - def find_modules : Array(Path) -- basedir = Path.new("/usr/share/doc") -+ basedir = Path.new(ARGV[0]? || "gtk-docs") - MODULES.compact_map do |mod| - print "#{mod.ljust(20, '.')}" - mod_dir = basedir.join(mod) diff --git a/pkgs/applications/misc/rtfm/patches/make.patch b/pkgs/applications/misc/rtfm/patches/make.patch deleted file mode 100644 index 51b95575cd0d6..0000000000000 --- a/pkgs/applications/misc/rtfm/patches/make.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile 2023-12-07 23:37:38.984501858 +0300 -+++ b/Makefile 2023-12-07 23:47:52.884456064 +0300 -@@ -4,8 +4,7 @@ - all: configure .WAIT rtfm docsets - - configure: -- shards install -- ./bin/gi-crystal -+ gi-crystal - - rtfm: - shards build --release -s rtfm -@@ -36,6 +35,8 @@ - # Changelog - install -D -m0644 CHANGELOG.md $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md - gzip -9fn $(DESTDIR)$(PREFIX)/share/doc/rtfm/CHANGELOG.md -+ gtk4-update-icon-cache --ignore-theme-index $(PREFIX)/share/icons/hicolor -+ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas - - uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/rtfm diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/applications/misc/rtfm/shards.nix index 0a7ce34cda62e..79a2eeb2f0db3 100644 --- a/pkgs/applications/misc/rtfm/shards.nix +++ b/pkgs/applications/misc/rtfm/shards.nix @@ -6,18 +6,18 @@ }; fzy = { url = "https://github.com/hugopl/fzy.git"; - rev = "v0.5.5"; - sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv"; + rev = "6c2395bcdea1889969d0d08c16163c276fe4e473"; + sha256 = "0vpradafkwckfsq7wqrgkpsli7bfmgc27d38q06l1jzq0z0j92rw"; }; - gio = { - url = "https://github.com/hugopl/gio.cr.git"; - rev = "v0.2.1"; - sha256 = "0vl5lpvhhdi9pvyl12smag0i3dwj1jjz1zzilc8ai0wjrnbnwlxs"; + gi-crystal = { + url = "https://github.com/hugopl/gi-crystal.git"; + rev = "v0.22.2"; + sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; - rev = "v0.16.0"; - sha256 = "1bnnfy07246vwbjfwhziv2yw1g52pzhhrr25660fp3qcnw8q513w"; + rev = "v0.16.1"; + sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj"; }; harfbuzz = { url = "https://github.com/hugopl/harfbuzz.cr.git"; @@ -31,8 +31,8 @@ }; pango = { url = "https://github.com/hugopl/pango.cr.git"; - rev = "v0.3.0"; - sha256 = "1dg5bcbq11zww4xh68dq4ivnsz89yqsnxz81ggp4j9c9d6dhx0m4"; + rev = "v0.3.1"; + sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv"; }; sqlite3 = { url = "https://github.com/crystal-lang/crystal-sqlite3.git"; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 63294e4048210..728a4aabed381 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -21,12 +21,15 @@ buildPythonPackage rec { "typer" ]; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ colorama openai pyperclip @@ -44,9 +47,9 @@ buildPythonPackage rec { meta = with lib; { description = "Describe your shell commands in natural language"; - mainProgram = "shell-genie"; homepage = "https://github.com/dylanjcastillo/shell-genie"; license = licenses.mit; maintainers = with maintainers; [ onny ]; + mainProgram = "shell-genie"; }; } diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 16849996441fe..b344a0e0639e2 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-xNM4qmpv+wcoiGrQ585N3VoKW6tio0cdHmUHRl2Pvio="; + vendorHash = "sha256-/qZB/GGEkoqRoNhEmZw9Q2lsUPZRg5/xVxWgdBZTMLk="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index b054be4be0948..116c5096cb599 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.6.3"; + version = "1.6.5"; pyproject = true; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-norcfoxZG9crgQz7p1+Gfne5il1AWfxdZa4JE/LfXU8="; + hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI="; }; buildInputs = [ @@ -67,6 +67,6 @@ python3Packages.buildPythonApplication rec { description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; mainProgram = "skytemple"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix marius851000 ]; + maintainers = with maintainers; [ marius851000 ]; }; } diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index e76dff0ca5705..901265016f8ef 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -8,34 +8,34 @@ , shiboken2 }: let - version = "0.1.3"; + version = "0.1.3+"; in buildPythonApplication rec { pname = "sl1-to-photon"; inherit version; src = fetchFromGitHub { - owner = "fookatchu"; + owner = "cab404"; repo = "SL1toPhoton"; - rev = "v${version}"; - sha256 = "1hmb74rcky3nax4lxn7pw6lcd5a66fdbwrm11c84zb31xb51bakw"; + rev = "7edc6ea99818622f5d49ac7af80ddd4916b8c19f"; + sha256 = "ssFfjlBMi3FHosDBUA2gs71VUIBkEdPVcV3STNxmOIM="; }; - propagatedBuildInputs = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; + pythonPath = [ pyphotonfile pillow numpy pyside2 shiboken2 ]; - format = "other"; + format = "setuptools"; + dontUseSetuptoolsCheck = true; installPhase = '' install -D -m 0755 SL1_to_Photon.py $out/bin/${pname} - sed -i '1i#!/usr/bin/env python' $out/bin/${pname} ''; meta = with lib; { maintainers = [ maintainers.cab404 ]; license = licenses.gpl3Plus; description = "Tool for converting Slic3r PE's SL1 files to Photon files for the Anycubic Photon 3D-Printer"; + homepage = "https://github.com/cab404/SL1toPhoton"; mainProgram = "sl1-to-photon"; - homepage = "https://github.com/fookatchu/SL1toPhoton"; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 5f0d83b078c8b..6695f53e99327 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.''; homepage = "https://slic3r.org/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index fcac061de0d14..94aad50bc1d37 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -8,6 +8,8 @@ , libXdmcp , conf ? null , patches ? [ ] +# update script dependencies +, gitUpdater }: stdenv.mkDerivation rec { @@ -36,11 +38,13 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + passthru.updateScript = gitUpdater {}; + meta = with lib; { homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; - maintainers = with maintainers; [ oxzi ]; + maintainers = with maintainers; [ oxzi qusic ]; platforms = platforms.linux; mainProgram = "slstatus"; }; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 049cee5a830de..711d549d1ac35 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/seenaburns/stag/commit/0a5a8533d0027b2ee38d109adb0cb7d65d171497.diff"; hash = "sha256-fqcsStduL3qfsp5wLJ0GLfEz0JRnOqsvpXB4gdWwVzg="; }) + # fix compilation on darwin, add explicit void parameter https://github.com/seenaburns/stag/pull/22 + (fetchpatch { + url = "https://github.com/seenaburns/stag/commit/bf831b0fa47fdc3654a659c1bc12b584c5bad18c.patch"; + hash = "sha256-C7S+phw2K26EUweKLDVZey/bUeYcTohdGcf7wixYIdM="; + }) ]; buildInputs = [ curses ]; diff --git a/pkgs/applications/misc/stog/asy.nix b/pkgs/applications/misc/stog/asy.nix new file mode 100644 index 0000000000000..58f1cf35f4d47 --- /dev/null +++ b/pkgs/applications/misc/stog/asy.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, stog, ocf_ppx }: + +buildDunePackage { + pname = "stog_asy"; + + inherit (stog) version src; + + buildInputs = [ ocf_ppx ]; + propagatedBuildInputs = [ stog ]; + + meta = stog.meta // { + description = "Stog plugin to include Asymptote results in documents"; + }; +} diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 17affeb3bbf65..b91624525483b 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,28 +1,18 @@ -{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml +{ lib, buildDunePackage, fetchFromGitLab , fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx , dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: -if lib.versionAtLeast ocaml.version "4.13" -then throw "stog is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "stog"; - version = "0.20.0"; - minimalOCamlVersion = "4.12"; + version = "1.0.0"; + minimalOCamlVersion = "4.13"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "stog"; rev = version; - sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; - }; - - # Compatibility with higlo 0.9 - patches = fetchpatch { - url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch"; - hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc="; + hash = "sha256-hMb6D6VSq2o2NjycwxZt3mZKy1FR+3afEwbOmTc991g="; }; nativeBuildInputs = [ menhir ]; diff --git a/pkgs/applications/misc/stog/markdown.nix b/pkgs/applications/misc/stog/markdown.nix new file mode 100644 index 0000000000000..48fd4a0b00967 --- /dev/null +++ b/pkgs/applications/misc/stog/markdown.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, stog, ocf_ppx, omd }: + +buildDunePackage { + pname = "stog_markdown"; + + inherit (stog) version src; + + buildInputs = [ ocf_ppx ]; + propagatedBuildInputs = [ omd stog ]; + + meta = stog.meta // { + description = "Stog plugin to use markdown syntax"; + }; +} + diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 2c8f9993fed54..bc429817d55ae 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchzip , fetchurl , makeWrapper , makeDesktopItem @@ -50,9 +51,12 @@ let find . -name '*.so' | xargs strings | { grep '/nix/store' || :; } >> ./.jar-paths ''; - nativeBuildInputs = [ makeWrapper unzip autoPatchelfHook ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; buildInputs = [ ant jdk p7zip gtk3 gsettings-desktop-schemas libXxf86vm ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + buildPhase = '' runHook preBuild @@ -100,20 +104,17 @@ let mainProgram = exec; }; }; - - d2u = lib.replaceStrings ["."] ["_"]; - in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "7.2"; + version = "7.3"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY="; + hash = "sha256-adMQzQE+xAZpMJyQFm01A+AfvcB5YHsJvk+533BUf1Q="; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d5cdebb762827..f4fe14fb6751b 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchzip , makeWrapper , makeDesktopItem , jdk @@ -18,14 +18,6 @@ let + removeSuffix "libraryeditor" (toLower m) + "-editor"; - applicationSrc = stdenv.mkDerivation { - name = "application-src"; - src = sweethome3dApp.src; - nativeBuildInputs = [ unzip ]; - buildPhase = ""; - installPhase = "cp -r . $out"; - }; - mkEditorProject = { pname, module, version, src, license, description, desktopName }: @@ -41,18 +33,21 @@ let categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ant jdk gtk3 gsettings-desktop-schemas ]; + # upstream targets Java 7 by default + env.ANT_ARGS = "-DappletClassSource=8 -DappletClassTarget=8 -DclassSource=8 -DclassTarget=8"; + postPatch = '' - sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml + sed -i -e 's,../SweetHome3D,${sweethome3dApp.src},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' runHook preBuild - ant -lib ${applicationSrc}/libtest -lib ${applicationSrc}/lib -lib ${jdk}/lib + ant -lib ${sweethome3dApp.src}/libtest -lib ${sweethome3dApp.src}/lib -lib ${jdk}/lib runHook postBuild ''; @@ -90,9 +85,9 @@ in { pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; license = lib.licenses.gpl2Plus; - src = fetchurl { + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "03vb9y645qzffxxdhgbjb0d98k3lafxckg2vh2s86j62b6357d0h"; + hash = "sha256-v8hMEUujTgWvFnBTF8Dnd1iWgoIXBzGMUxBgmjdxx+g="; }; desktopName = "Sweet Home 3D - Textures Library Editor"; }; @@ -102,10 +97,10 @@ in { module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; - license = lib.licenses.gpl2; - src = fetchurl { + license = lib.licenses.gpl2Plus; + src = fetchzip { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-r5xJlUctUdcknJfm8rbz+bdzFhqgHsHpHwxEC4mItws="; + hash = "sha256-pqsSxQPzsyx4PS98fgU6UFhPWhpQoepGm0uJtkvV46c="; }; desktopName = "Sweet Home 3D - Furniture Library Editor"; }; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 8029ff5031193..414606fa2084c 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -34,14 +34,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.0"; + version = "1.5.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-O8FLjse2gY8KNWGXpUeZ83cNk0ZuRAZJJ3Am33/ABVw="; + hash = "sha256-OjrkmpH9sVrO3M25PKj6jhmI2DmbP+/r4mOZ4BqE/1Y="; }; buildInputs = [ diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index f05c8a0aa0746..c059c566fecd3 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -17,7 +17,9 @@ let Type = "exec"; ExecStart = "@out@/bin/systembus-notify"; PrivateTmp = true; - ProtectHome = true; + # NB. We cannot `ProtectHome`, or it would block session dbus access. + InaccessiblePaths = "/home"; + ReadOnlyPaths = "/run/user"; ProtectSystem = "strict"; Restart = "on-failure"; Slice = "background.slice"; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 8461ed816eb9a..7b0c1f3897d4a 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.12"; + version = "1.5.16"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-5UslXRoiq9cipGCOiqpf+rv7OPTsW4qpVTjakNeg4ug="; + hash = "sha256-A5cPO3uybTmAV8zWY90S9vtU/tLgbh1Iqhi+ty0RLhM="; }; - yarnHash = "sha256-CresovsRh+dLHGnv49fCi/i66QXOS3SnzfFNvkVUfd8="; + yarnHash = "sha256-OAgVaXWTVlKqIgDgKNT1MWN3dYzTqrAGgNAnXLDHE+I="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index dc36156ff4a1b..dbf5500494c45 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -32,15 +32,15 @@ python.pkgs.pythonPackages.buildPythonPackage rec { format = "other"; patches = [ - # Allow setting MEDIA_ROOT through environment variable - # https://github.com/TandoorRecipes/recipes/pull/2931 - (fetchpatch { - url = "https://github.com/TandoorRecipes/recipes/commit/abf981792057481f1d5b7473eb1090b3901ef8fa.patch"; - hash = "sha256-3AFf0K/BpVwPQ2NGLUsefj6HvW7ej3szd3WaxFoqMiQ="; - }) + ./pytest-xdist.patch # adapt pytest.ini the use $NIX_BUILD_CORES ]; + postPatch = '' + substituteInPlace pytest.ini --subst-var NIX_BUILD_CORES + ''; + propagatedBuildInputs = with python.pkgs; [ + aiohttp beautifulsoup4 bleach bleach-allowlist @@ -50,7 +50,6 @@ python.pkgs.pythonPackages.buildPythonPackage rec { django-allauth django-annoying django-auth-ldap - django-autocomplete-light django-cleanup django-cors-headers django-crispy-forms @@ -132,15 +131,21 @@ python.pkgs.pythonPackages.buildPythonPackage rec { ''; nativeCheckInputs = with python.pkgs; [ + mock pytestCheckHook + pytest-asyncio + pytest-cov pytest-django pytest-factoryboy + pytest-html + pytest-xdist ]; # flaky disabledTests = [ "test_search_count" "test_url_import_regex_replace" + "test_delete" ]; passthru = { diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index d63c0874171e4..2b53e1efa9305 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }: let common = callPackage ./common.nix { }; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs nodejs.pkgs.yarn ]; diff --git a/pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch b/pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch new file mode 100644 index 0000000000000..39b5acf00dea4 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch @@ -0,0 +1,12 @@ +diff --git a/pytest.ini b/pytest.ini +index a3d26ec4..8bdf12fb 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -3,5 +3,5 @@ DJANGO_SETTINGS_MODULE = recipes.test_settings + testpaths = cookbook/tests + python_files = tests.py test_*.py *_tests.py + # uncomment to run coverage reports +-addopts = -n auto --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html ++addopts = -n @NIX_BUILD_CORES@ --cov=. --cov-report=html:docs/reports/coverage --cov-report=xml:docs/reports/coverage/coverage.xml --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html + # addopts = -n auto --junitxml=docs/reports/tests/pytest.xml --html=docs/reports/tests/tests.html +\ No newline at end of file diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 236c81da562c0..5d8b453b0f4ea 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lharding/tasknc"; description = "A ncurses wrapper around taskwarrior"; mainProgram = "tasknc"; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; # Cannot test others license = licenses.mit; }; diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix index 9d1ee035d81a3..275e9627372fe 100644 --- a/pkgs/applications/misc/terminal-stocks/default.nix +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terminal-stocks"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "shweshi"; repo = pname; rev = "v${version}"; - hash = "sha256-tu6SKeTVEqIqDJXimoSkMK9+l0uGqWSrlIO0KHoROSQ="; + hash = "sha256-hCKUUISn/TIr2o3ZtG2kSTgmUCut4NVzIzfIrg84PYI="; }; - npmDepsHash = "sha256-13RiEBLhmKW04Tesg1s7c9rCYtRGOd/prnVARb6jpGQ="; + npmDepsHash = "sha256-t71SfoPYVFLWcrjv2ErWazDeaVTO4W46g4lFler86Sc="; dontNpmBuild = true; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 8624bded6641f..4a123be328c90 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "tiramisu"; - version = "2.0.20211107"; + # FIXME: once a newer release in upstream is available + version = "2.0-unstable-2023-03-29"; src = fetchFromGitHub { owner = "Sweets"; - repo = pname; - rev = version; - sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw"; + repo = "tiramisu"; + # FIXME: use the current HEAD commit as upstream has no releases since 2021 + rev = "5dddd83abd695bfa15640047a97a08ff0a8d9f9b"; + hash = "sha256-owYk/YFwJbqO6/dbGKPE8SnmmH4KvH+o6uWptqQtpfI="; }; buildInputs = [ glib ]; diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix index 50af143808889..802b20c555769 100644 --- a/pkgs/applications/misc/tmatrix/default.nix +++ b/pkgs/applications/misc/tmatrix/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/M4444/TMatrix"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ infinisil Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne ]; mainProgram = "tmatrix"; }; } diff --git a/pkgs/applications/misc/tomato-c/default.nix b/pkgs/applications/misc/tomato-c/default.nix index 9f87712399f2b..243b21b574efa 100644 --- a/pkgs/applications/misc/tomato-c/default.nix +++ b/pkgs/applications/misc/tomato-c/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , libnotify , makeWrapper , mpv @@ -19,15 +20,26 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs="; }; + patches = [ + # Adds missing function declarations required by newer versions of clang. + (fetchpatch { + url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch"; + hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8="; + }) + ]; + postPatch = '' substituteInPlace Makefile \ - --replace "sudo " "" + --replace-fail "sudo " "" + # Need to define _ISOC99_SOURCE to use `snprintf` on Darwin + substituteInPlace config.mk \ + --replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE substituteInPlace notify.c \ - --replace "/usr/local" "${placeholder "out"}" + --replace-fail "/usr/local" "${placeholder "out"}" substituteInPlace util.c \ - --replace "/usr/local" "${placeholder "out"}" + --replace-fail "/usr/local" "${placeholder "out"}" substituteInPlace tomato.desktop \ - --replace "/usr/local" "${placeholder "out"}" + --replace-fail "/usr/local" "${placeholder "out"}" ''; nativeBuildInputs = [ @@ -41,8 +53,11 @@ stdenv.mkDerivation (finalAttrs: { ncurses ]; - installFlags = [ + makeFlags = [ "PREFIX=${placeholder "out"}" + ]; + + installFlags = [ "CPPFLAGS=$NIX_CFLAGS_COMPILE" "LDFLAGS=$NIX_LDFLAGS" ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index ff20f89574be4..4a92a9d0e79b4 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://www.soimort.org/translate-shell"; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; - maintainers = with maintainers; [ ebzzry infinisil ]; + maintainers = with maintainers; [ ebzzry ]; mainProgram = "trans"; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 83db22260d83d..df7cb0a083923 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -2,19 +2,19 @@ , cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip , libGL, libGLU, freeimage, freetype, assimp , catch2, fmt, glew, miniz, tinyxml-2, xorg -, qtbase, wrapQtAppsHook +, qtbase, qtwayland, wrapQtAppsHook , copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "TrenchBroom"; - version = "2023.1"; + version = "2024.1"; src = fetchFromGitHub { owner = "TrenchBroom"; repo = "TrenchBroom"; rev = "v${version}"; - sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA="; + hash = "sha256-HNK/gLbew7MKN6GVStxDb2tyMgyw2l1+dhPr6fSaZ4A="; fetchSubmodules = true; }; # Manually simulate a vcpkg installation so that it can link the libraries @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ]; buildInputs = [ libGL libGLU xorg.libXxf86vm xorg.libSM - freeimage freetype qtbase catch2 fmt + freeimage freetype qtbase qtwayland catch2 fmt glew miniz tinyxml-2 assimp ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index de72638d19ffe..180b09771ce3e 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - hash = "sha256-IvAx65b2rGsMdDUhRxTx8cyqnG7oxC+MseCFIJil1e0="; + hash = "sha256-L6xdJ659ZWKNg9CGQs+5TQIKoIAZ5KHdFSk7NCp9a2Q="; }; - cargoHash = "sha256-o3J2bEAV5NnWKFadJdSGTqUS8K2qpBKPQz6xAbfLtg4="; + cargoHash = "sha256-iOeyn4oXk6y/NqZeBwkStBjt3hVVw4s2L5Lm58tq1BY="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix index 384b5362a4ad3..f997652c27ecb 100644 --- a/pkgs/applications/misc/tvbrowser/default.nix +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -5,6 +5,7 @@ , ant , jdk , makeWrapper +, stripJavaArchivesHook , callPackage }: @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI="; }; - nativeBuildInputs = [ ant jdk makeWrapper ]; + nativeBuildInputs = [ ant jdk makeWrapper stripJavaArchivesHook ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index 70becdc143bda..cb7f92d08f36e 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.10.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-D6I1r+8cvUerqXR2VyBL33lapWAs5Cl5yvYOsmUBnHo="; + hash = "sha256-LpQHdqvqAj3gqyvsD58Jhu4GkeJ/R7EjKo7YG7/mmJk="; }; - vendorHash = "sha256-j/nyAHNwUoNkcdNJqcaUuhQk5a2VHQw/XgYIoTR9ctQ="; + vendorHash = "sha256-lpeceY6ErcxCGKrwVuW19ofsXyfXsJgKGThWKswRTis="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix index 02e8411999fef..f2c0a9aa02e88 100644 --- a/pkgs/applications/misc/ubpm/default.nix +++ b/pkgs/applications/misc/ubpm/default.nix @@ -1,35 +1,31 @@ { stdenv, lib, fetchFromGitea, qmake, qttools, qtbase, qtserialport -, qtconnectivity, qtcharts, wrapQtAppsHook }: +, qtconnectivity, qtcharts, wrapQtAppsHook, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "ubpm"; - version = "1.7.3"; + version = "1.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "LazyT"; repo = "ubpm"; rev = finalAttrs.version; - hash = "sha256-6lvDSU0ssfs71xrac6R6qlmE0QyVcAMTUf0xmJPVzhY="; + hash = "sha256-BUUn1WyLT7nm4I+2SpO1ZtIf8isGDy8Za15SiO7sXL8="; }; - postPatch = '' - substituteInPlace sources/mainapp/mainapp.pro \ - --replace 'INSTALLDIR = /tmp/ubpm.AppDir' "INSTALLDIR = $out" \ - --replace '/usr/bin' '/bin' \ - --replace 'INSTALLS += target translations themes devices help lin' 'INSTALLS += target translations themes devices help' - ''; + patches = [ + # fixes qmake for nix + (fetchpatch { + url = + "https://codeberg.org/LazyT/ubpm/commit/f18841d6473cab9aa2a9d4c02392b8e103245ef6.diff"; + hash = "sha256-lgXWu8PUUCt66btj6hVgOFXz3U1BJM3ataSo1MpHkfU="; + }) + ]; preConfigure = '' cd ./sources/ ''; - postInstall = '' - install -Dm644 ../package/lin/ubpm.desktop -t $out/share/applications/ - install -Dm644 ../package/lin/de.lazyt.ubpm.appdata.xml -t $out/share/metainfo/ - install -Dm644 ../sources/mainapp/res/ico/app.png $out/share/icons/hicolor/256x256/apps/ubpm.png - ''; - postFixup = '' wrapQtApp $out/bin/ubpm ''; @@ -47,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ubpm"; license = licenses.gpl3Only; maintainers = with maintainers; [ kurnevsky ]; + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 232a4456e60ee..080e96359e5ad 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.6"; + version = "5.15.7"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-WOWDekh9rcXeiN/ejiYC4BELhJwd98GkmyDOLN26ayU="; + sha256 = "sha256-YgOw3Gyy/o8qorWAnAlQrAZ2ZTnyP3PagLs2Qkdg788="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 1dad31d2539cf..4e07cf62821d2 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "-Dvapi=false" ]; - meta = with lib; { + meta = { description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; mainProgram = "valent"; longDescription = '' @@ -82,8 +82,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; + maintainers = with lib.maintainers; [ aleksana federicoschonborn ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 43c3aea38e82f..5d9f87b2316ac 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-4VQcIynkENScxpeM09IXrpMszqojlMuyjtXX2lbS9dg="; + hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE="; }; - vendorHash = "sha256-/XW5Gq9Yz+M7Al1hy6pow34e3Cn3q8aA0ByRdhWXUIQ="; + vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 823cf7fa75ecb..d4122e6571d98 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -2,6 +2,7 @@ , stdenv , bash , fetchFromGitHub +, fetchFromGitLab , SDL2 , alsa-lib , catch2_3 @@ -51,6 +52,7 @@ , mpdSupport ? true , mprisSupport ? stdenv.isLinux , nlSupport ? true +, pipewireSupport ? true , pulseSupport ? true , rfkillSupport ? true , runTests ? true @@ -61,6 +63,7 @@ , upowerSupport ? true , wireplumberSupport ? true , withMediaPlayer ? mprisSupport && false +, nix-update-script }: let @@ -71,6 +74,17 @@ let rev = "0.10.1"; hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; }; + + wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { + version = "0.4.17"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; + repo = "wireplumber"; + rev = version; + hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; + }; + }); in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; @@ -122,7 +136,6 @@ stdenv.mkDerivation (finalAttrs: { fftw iniparser ncurses - pipewire portaudio ] ++ lib.optional evdevSupport libevdev @@ -138,7 +151,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional traySupport libdbusmenu-gtk3 ++ lib.optional udevSupport udev ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber + ++ lib.optional wireplumberSupport wireplumber_0_4 + ++ lib.optional (cavaSupport || pipewireSupport) pipewire ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; nativeCheckInputs = [ catch2_3 ]; @@ -154,6 +168,7 @@ stdenv.mkDerivation (finalAttrs: { "man-pages" = true; "mpd" = mpdSupport; "mpris" = mprisSupport; + "pipewire" = pipewireSupport; "pulseaudio" = pulseSupport; "rfkill" = rfkillSupport; "sndio" = sndioSupport; @@ -175,6 +190,8 @@ stdenv.mkDerivation (finalAttrs: { --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/alexays/waybar"; description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/applications/misc/waycorner/default.nix index 01b1b80277cb1..2d1303bb26c77 100644 --- a/pkgs/applications/misc/waycorner/default.nix +++ b/pkgs/applications/misc/waycorner/default.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage rec { pname = "waycorner"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "AndreasBackx"; repo = "waycorner"; rev = version; - hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ="; + hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; - cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI="; + cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; buildInputs = [ wayland ]; diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/applications/misc/waylock/default.nix index e07c2b7ed53cc..9ed2cc12131e9 100644 --- a/pkgs/applications/misc/waylock/default.nix +++ b/pkgs/applications/misc/waylock/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "waylock"; - version = "0.6.5"; + version = "1.0.0"; src = fetchFromGitea { domain = "codeberg.org"; @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "waylock"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-wvZrRPZobDh+rB3RSaRrz0xDHuYwT2eoQEu3AbYKn8Y="; + hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 83b310ef885ef..97883864ad75f 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "whalebird"; - version = "6.0.4"; + version = "6.1.0"; src = fetchFromGitHub { owner = "h3poteto"; repo = "whalebird-desktop"; rev = "v${version}"; - hash = "sha256-Yx0GEEPJ+d4/RvCbqZdKR6iE2iUNbOJr+RuboqjT8z8="; + hash = "sha256-Jf+vhsfVjNrxdBkwwh3D3d2AlsGHfmEn90dq2QrKi2k="; }; # we cannot use fetchYarnDeps because that doesn't support yarn 2/berry lockfiles offlineCache = stdenv.mkDerivation { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; - outputHash = "sha256-RjTGAgHRRQ4O3eTYpmTrl+KXafDZkWf1NH6lzdozVAA="; + outputHash = "sha256-SJCJq1vkO/jH9YgB3rV/pK4wV5Prm3sNjOj9YwL6XTw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix deleted file mode 100644 index c1d3dc2f10f2a..0000000000000 --- a/pkgs/applications/misc/wike/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, meson -, ninja -, pkg-config -, appstream-glib -, desktop-file-utils -, gobject-introspection -, wrapGAppsHook4 -, glib -, gtk4 -, librsvg -, libadwaita -, glib-networking -, webkitgtk_6_0 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "wike"; - version = "2.1.0"; - format = "other"; - - src = fetchFromGitHub { - owner = "hugolabe"; - repo = "Wike"; - rev = version; - hash = "sha256-BXmLZhotQK6L4c2D8F8qF3zmOlSuzXycEN2FaC1K6/g="; - }; - - nativeBuildInputs = [ - meson - pkg-config - ninja - appstream-glib - desktop-file-utils - gobject-introspection - wrapGAppsHook4 - ]; - - buildInputs = [ - glib - gtk4 - librsvg - libadwaita - glib-networking - webkitgtk_6_0 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - requests - pygobject3 - ]; - - postPatch = '' - patchShebangs build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - - # prevent double wrapping - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "Wikipedia Reader for the GNOME Desktop"; - homepage = "https://github.com/hugolabe/Wike"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ samalws ]; - mainProgram = "wike"; - }; -} diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index de88c3fd1a40d..748c2d3b84c92 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -26,6 +26,14 @@ stdenv.mkDerivation rec { hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI="; }; + # Upstream patch needed to fix NULL deref + patches = [ + (fetchpatch { + url = "https://git.sr.ht/~adnano/wmenu/commit/2856dddcac861ddf248143e66ba164d7aa05a0bb.patch"; + hash = "sha256-P7SEjMssA8unNAlrgrTHm0uW5pefjpupPb4s/u2fTAM="; + }) + ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ]; diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index 359853e6624ed..38f0f83181348 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple emoji selector for Wayland using wofi and wl-clipboard"; - homepage = "https://github.com/dln/wofi-emoji"; + homepage = "https://github.com/Zeioth/wofi-emoji"; license = licenses.mit; maintainers = [ maintainers.ymarkus ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index fe1d221bd274c..d505ae2e380a0 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "writefreely"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "writefreely"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vOoTAr33FMQaHIwpwIX0g/KJWQvDn3oVJg14kEY6FIQ="; + sha256 = "sha256-7KTNimthtfmQCgyXevAEj+CZ2MS+uOby73OO1fGNXfs="; }; - vendorHash = "sha256-xTo/zbz9pSjvNntr5dnytiJ7oRAdtEuyiu4mJZgwHTc="; + vendorHash = "sha256-6RTshhxX+w/gdK53wCHVMpm6EkkRtEJ2/Fe7MfZ0WvY="; + + patches = [ + ./fix-go-version-error.patch + ]; ldflags = [ "-s" "-w" "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; diff --git a/pkgs/applications/misc/writefreely/fix-go-version-error.patch b/pkgs/applications/misc/writefreely/fix-go-version-error.patch new file mode 100644 index 0000000000000..bfe7ba2dd5dc4 --- /dev/null +++ b/pkgs/applications/misc/writefreely/fix-go-version-error.patch @@ -0,0 +1,36 @@ +diff --git a/go.mod b/go.mod +index c49d701..601443d 100644 +--- a/go.mod ++++ b/go.mod +@@ -89,4 +89,6 @@ require ( + gopkg.in/yaml.v3 v3.0.1 // indirect + ) + +-go 1.19 ++go 1.21 ++ ++toolchain go1.21.6 +diff --git a/go.sum b/go.sum +index a9256ea..28ad24f 100644 +--- a/go.sum ++++ b/go.sum +@@ -72,6 +72,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw + github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= + github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= ++github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= + github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= + github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= + github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI= +@@ -106,9 +107,11 @@ github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVY + github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= + github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= + github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= ++github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= ++github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= + github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI= + github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g= + github.com/mailgun/mailgun-go v2.0.0+incompatible h1:0FoRHWwMUctnd8KIR3vtZbqdfjpIMxOZgcSa51s8F8o= diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index f604f50eb7fc3..a32527de7dabb 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; }; - vendorHash = "sha256-9uuLidieBMoKz/FLcBnp9wenyveOIzB0IvRBRasulZk="; + vendorHash = "sha256-mQdKw3DeBEkCOtV2/B5lUIHv5EBp+8QSxpA13nFxESw="; proxyVendor = true; doCheck = false; diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 7434000479746..6cba42d0c1582 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -3,22 +3,25 @@ , fetchFromGitHub , rustPlatform , darwin +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-9qAluu9W6OG/G1SmAEOe97mUS83PZL/oLYUsIJNunwY="; + hash = "sha256-kRrVqUfkrSK/9z3Hj4J+mKcdV7JdTzjhxlVRa/kf8sw="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-AVlI2Yi3Gx9jCgP2O5NfaTvUFHdw6HPRmsMqbPFvxf8="; + cargoHash = "sha256-HxSyGME95FWR5VwodmrMUX0jPlfE9SJV0WBbICuuTok="; + + passthru.updateScript = nix-update-script { }; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 7b339a868002d..19b5a8e3ec2d3 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,26 +1,35 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config -, libtool, openssl, qtbase, qttools, sphinx }: - -mkDerivation rec { +{ stdenv +, lib +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, pkg-config +, openssl +, qtbase +, qttools +, sphinx +}: + +stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { - owner = "chris2511"; - repo = "xca"; - rev = "RELEASE.${version}"; - sha256 = "04z0mmjsry72nvib4icmwh1717y4q9pf2gr68ljrzln4vv4ckpwk"; + owner = "chris2511"; + repo = "xca"; + rev = "RELEASE.${finalAttrs.version}"; + hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220="; }; - # Adaptions to stay OpenSSL 3.0 compatible - patches = [ (fetchpatch { - url = "https://github.com/chris2511/xca/commit/f5ac099e948ea354deac75ff9fa09d51453476e1.patch"; - hash = "sha256-4rRO2y9hZq879HTsgBgbXGRYEcgfG4niJKyK3l3PMZ8="; - }) ]; - - buildInputs = [ libtool openssl qtbase ]; + buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkg-config qttools sphinx ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + sphinx + wrapQtAppsHook + ]; # Needed for qcollectiongenerator (see https://github.com/NixOS/nixpkgs/pull/92710) QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; @@ -28,12 +37,11 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; mainProgram = "xca"; - homepage = "https://hohnstaedt.de/xca/"; - license = licenses.bsd3; + homepage = "https://hohnstaedt.de/xca/"; + license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; - platforms = platforms.all; + inherit (qtbase.meta) platforms; }; -} +}) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index b0f8562c17285..db7bdd4fc727b 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.1"; + version = "6.21.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-xMfNWqr43Gxu+ET8oP9l97+tBsL/b6DNuFU4j9wy0UA="; + hash = "sha256-0ej2+g+B9K50JIs0wi1SfLBsaYTsk+0/cImLLZLNtmc="; }; patches = [ diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 23b6c07ba6c6c..20d79d6c4ac0c 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.21.0"; + version = "6.21.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-ICRzd1iCm/TciVe0RqVFiiY74RK0KpEGPJ2v+wSRIEo="; + hash = "sha256-70SYdO3uyPINanAoARd2lDwyiuc2f/gg4QuoDgoXjjs="; }; postPatch = '' diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 83ca257a98b17..a6e0f5d588606 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.2"; + version = "1.11.4"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-E75lqQkaCub/WpxvVHB5YP1E1ygjUURJ1VWrjvcV96o="; + hash = "sha256-0YS+q1gy7YmTx/DwxaElBG1tzosXReXqPu6RpR3hTjw="; }; - vendorHash = "sha256-Xrr4QE0FN6sII4xOjPbhwBlNgEwOlogKRNStjrjH7H0="; + vendorHash = "sha256-et1PVLJQ/vBsg5438s6d9MA2oV40zahp9YKQOE0RX58="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix deleted file mode 100644 index cca2e549c8b1c..0000000000000 --- a/pkgs/applications/networking/bee/bee.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoModule -}: - -buildGoModule rec { - pname = "bee"; - version = "1.18.2"; - - src = fetchFromGitHub { - owner = "ethersphere"; - repo = "bee"; - rev = "v${version}"; - sha256 = "sha256-LUOKF1073GmQWG2q4w0cTErSHw7ok5N6PQZ45xpjYx4="; - }; - - vendorHash = "sha256-UdsF/otjXqS1NY3PkCimRiD93hGntHG3Xhw6avFtHog="; - - subPackages = [ "cmd/bee" ]; - - ldflags = [ - "-s" - "-w" - "-X github.com/ethersphere/bee.version=${version}" - "-X github.com/ethersphere/bee/pkg/api.Version=5.2.0" - "-X github.com/ethersphere/bee/pkg/api.DebugVersion=4.1.0" - "-X github.com/ethersphere/bee/pkg/p2p/libp2p.reachabilityOverridePublic=false" - "-X github.com/ethersphere/bee/pkg/postage/listener.batchFactorOverridePublic=5" - ]; - - CGO_ENABLED = 0; - - postInstall = '' - mkdir -p $out/lib/systemd/system - cp packaging/bee.service $out/lib/systemd/system/ - cp packaging/bee-get-addr $out/bin/ - chmod +x $out/bin/bee-get-addr - patchShebangs $out/bin/ - ''; - - meta = with lib; { - homepage = "https://github.com/ethersphere/bee"; - description = "Ethereum Swarm Bee"; - longDescription = '' - A decentralised storage and communication system for a sovereign digital society. - - Swarm is a system of peer-to-peer networked nodes that create a decentralised storage - and communication service. The system is economically self-sustaining due to a built-in - incentive system enforced through smart contracts on the Ethereum blockchain. - - Bee is a Swarm node implementation, written in Go. - ''; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 8c659a99d0ffb..e7204a68d14cb 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { ''; homepage = "https://brig.readthedocs.io"; changelog = "https://github.com/sahib/brig/releases/tag/${src.rev}"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ offline ]; mainProgram = "brig"; }; diff --git a/pkgs/applications/networking/browsers/amfora/default.nix b/pkgs/applications/networking/browsers/amfora/default.nix deleted file mode 100644 index fe778ded9e3bf..0000000000000 --- a/pkgs/applications/networking/browsers/amfora/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: - -buildGoModule rec { - pname = "amfora"; - version = "1.9.2"; - - src = fetchFromGitHub { - owner = "makeworld-the-better-one"; - repo = "amfora"; - rev = "v${version}"; - sha256 = "sha256-93xNzYPoy8VsbY2JyvDXt4J/gIbI2wzrCD83JUaP150="; - }; - - vendorHash = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; - - postInstall = lib.optionalString (!stdenv.isDarwin) '' - sed -i "s:amfora:$out/bin/amfora:" amfora.desktop - install -Dm644 amfora.desktop -t $out/share/applications - ''; - - meta = with lib; { - description = "A fancy terminal browser for the Gemini protocol"; - mainProgram = "amfora"; - homepage = "https://github.com/makeworld-the-better-one/amfora"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ deifactor ]; - changelog = "https://github.com/makeworld-the-better-one/amfora/blob/v${version}/CHANGELOG.md"; - }; -} diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/applications/networking/browsers/badwolf/default.nix index 2200f878172be..5772586d8d4ef 100644 --- a/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/pkgs/applications/networking/browsers/badwolf/default.nix @@ -1,39 +1,49 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchgit +, ninja , pkg-config +, ed , wrapGAppsHook , webkitgtk , libxml2 -, glib , glib-networking , gettext }: + stdenv.mkDerivation rec { pname = "badwolf"; - version = "1.2.2"; + version = "1.3.0"; src = fetchgit { - url = "git://hacktivis.me/git/badwolf.git"; + url = "https://hacktivis.me/git/badwolf.git"; rev = "v${version}"; - hash = "sha256-HfAsq6z+1kqMAsNxJjWJx9nd2cbv0XN4KRS8cYuhOsQ="; + hash = "sha256-feWSxK9TJ5MWxUKutuTcdmMk5IbLjNseUAvfm20kQ1U="; }; - preConfigure = '' - export PREFIX=$out - ''; + # configure script not accepting '--prefix' + prefixKey = "PREFIX="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + ninja + pkg-config + ed + wrapGAppsHook + ]; - buildInputs = [ webkitgtk libxml2 gettext glib glib-networking ]; + buildInputs = [ + webkitgtk + libxml2 + gettext + glib-networking + ]; meta = with lib; { description = "Minimalist and privacy-oriented WebKitGTK+ browser"; mainProgram = "badwolf"; homepage = "https://hacktivis.me/projects/badwolf"; - license = licenses.bsd3; + license = with licenses; [ bsd3 cc-by-sa-40 ]; platforms = platforms.linux; - maintainers = with maintainers; [ laalsaas ]; + maintainers = with maintainers; [ laalsaas aleksana ]; }; - } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 1a2831a4914bf..3061d4ea37d52 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,214 +1,24 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, dpkg -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gnome -, gsettings-desktop-schemas -, gtk3 -, gtk4 -, libX11 -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libkrb5 -, libuuid -, libxkbcommon -, libxshmfence -, mesa -, nspr -, nss -, pango -, pipewire -, snappy -, udev -, wayland -, xdg-utils -, coreutils -, xorg -, zlib - -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" - -# Necessary for USB audio devices. -, pulseSupport ? stdenv.isLinux -, libpulseaudio - -# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) -, libGL - -# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.isLinux -, libva -, enableVideoAcceleration ? libvaSupport - -# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API -, vulkanSupport ? false -, addOpenGLRunpath -, enableVulkan ? vulkanSupport -}: - -let - inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath - optionalString strings escapeShellArg; - - deps = [ - alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat - fontconfig freetype gdk-pixbuf glib gtk3 gtk4 libdrm libX11 libGL - libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage - libXext libXfixes libXi libXrandr libXrender libxshmfence - libXtst libuuid mesa nspr nss pango pipewire udev wayland - xorg.libxcb zlib snappy libkrb5 - ] - ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva; - - rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; - binpath = makeBinPath deps; - - enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] - ++ optional enableVulkan "Vulkan"; - - disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates - # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 - ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; -in - -stdenv.mkDerivation rec { - pname = "brave"; - version = "1.63.174"; - - src = fetchurl { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-COy1XwooN0agp5dLDVUAfhpFvgubbClaGrUQ5PFgTJk="; - }; - - dontConfigure = true; - dontBuild = true; - dontPatchELF = true; - doInstallCheck = true; - - nativeBuildInputs = [ - dpkg - (wrapGAppsHook.override { inherit makeWrapper; }) - ]; - - buildInputs = [ - # needed for GSETTINGS_SCHEMAS_PATH - glib gsettings-desktop-schemas gtk3 gtk4 - - # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme - ]; - - unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - - installPhase = '' - runHook preInstall - - mkdir -p $out $out/bin - - cp -R usr/share $out - cp -R opt/ $out/opt - - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser - - # Fix path to bash in $BINARYWRAPPER - substituteInPlace $BINARYWRAPPER \ - --replace /bin/bash ${stdenv.shell} - - ln -sf $BINARYWRAPPER $out/bin/brave - - for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe - done - - # Fix paths - substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser-stable $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/share/menu/brave-browser.menu \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ - --replace /opt/brave.com $out/opt/brave.com - - # Correct icons location - icon_sizes=("16" "24" "32" "48" "64" "128" "256") - - for icon in ''${icon_sizes[*]} - do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png - done - - # Replace xdg-settings and xdg-mime - ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime - - runHook postInstall - ''; - - preFixup = '' - # Add command line args to wrapGApp. - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : ${rpath} - --prefix PATH : ${binpath} - --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} - ${optionalString (enableFeatures != []) '' - --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}" - ''} - ${optionalString (disableFeatures != []) '' - --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" - ''} - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - ${optionalString vulkanSupport '' - --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" - ''} - --add-flags ${escapeShellArg commandLineArgs} - ) - ''; - - installCheckPhase = '' - # Bypass upstream wrapper which suppresses errors - $out/opt/brave.com/brave/brave --version - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://brave.com/"; - description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + replaceStrings [ "." ] [ "" ] version; - longDescription = '' - Brave browser blocks the ads and trackers that slow you down, - chew up your bandwidth, and invade your privacy. Brave lets you - contribute to your favorite creators automatically. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "brave"; - }; -} +# Expression generated by update.sh; do not edit it by hand! +{ stdenv, callPackage, ... }@args: + +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) + ( + if stdenv.isAarch64 then + { + pname = "brave"; + version = "1.65.114"; + url = "https://github.com/brave/brave-browser/releases/download/v1.65.114/brave-browser_1.65.114_arm64.deb"; + hash = "sha256-E5IqMmkgnwn1eyKcPQ3SZX4QpGor2W8JH+rmERuUonA="; + platform = "aarch64-linux"; + } + else if stdenv.isx86_64 then + { + pname = "brave"; + version = "1.65.114"; + url = "https://github.com/brave/brave-browser/releases/download/v1.65.114/brave-browser_1.65.114_amd64.deb"; + hash = "sha256-Dn6havSLcf6KCxI1hd8Ad4FsLIOYBH2KO2oCJJQHJm8="; + platform = "x86_64-linux"; + } + else + throw "Unsupported platform." + ) diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix new file mode 100644 index 0000000000000..8fde41e60a16b --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -0,0 +1,218 @@ +{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, dpkg +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gnome +, gsettings-desktop-schemas +, gtk3 +, gtk4 +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libdrm +, libkrb5 +, libuuid +, libxkbcommon +, libxshmfence +, mesa +, nspr +, nss +, pango +, pipewire +, snappy +, udev +, wayland +, xdg-utils +, coreutils +, xorg +, zlib + +# command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? "" + +# Necessary for USB audio devices. +, pulseSupport ? stdenv.isLinux +, libpulseaudio + +# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) +, libGL + +# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) +, libvaSupport ? stdenv.isLinux +, libva +, enableVideoAcceleration ? libvaSupport + +# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API +, vulkanSupport ? false +, addOpenGLRunpath +, enableVulkan ? vulkanSupport +}: + +{ pname +, version +, hash +, url +, platform +}: + +let + inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath + optionalString strings escapeShellArg; + + deps = [ + alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat + fontconfig freetype gdk-pixbuf glib gtk3 gtk4 libdrm libX11 libGL + libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr libXrender libxshmfence + libXtst libuuid mesa nspr nss pango pipewire udev wayland + xorg.libxcb zlib snappy libkrb5 + ] + ++ optional pulseSupport libpulseaudio + ++ optional libvaSupport libva; + + rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; + binpath = makeBinPath deps; + + enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] + ++ optional enableVulkan "Vulkan"; + + disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates + # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 + ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + inherit url hash; + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + doInstallCheck = true; + + nativeBuildInputs = [ + dpkg + (wrapGAppsHook.override { inherit makeWrapper; }) + ]; + + buildInputs = [ + # needed for GSETTINGS_SCHEMAS_PATH + glib gsettings-desktop-schemas gtk3 gtk4 + + # needed for XDG_ICON_DIRS + gnome.adwaita-icon-theme + ]; + + unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; + + installPhase = '' + runHook preInstall + + mkdir -p $out $out/bin + + cp -R usr/share $out + cp -R opt/ $out/opt + + export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + + # Fix path to bash in $BINARYWRAPPER + substituteInPlace $BINARYWRAPPER \ + --replace /bin/bash ${stdenv.shell} + + ln -sf $BINARYWRAPPER $out/bin/brave + + for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe + done + + # Fix paths + substituteInPlace $out/share/applications/brave-browser.desktop \ + --replace /usr/bin/brave-browser-stable $out/bin/brave + substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/share/menu/brave-browser.menu \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/opt/brave.com/brave/default-app-block \ + --replace /opt/brave.com $out/opt/brave.com + + # Correct icons location + icon_sizes=("16" "24" "32" "48" "64" "128" "256") + + for icon in ''${icon_sizes[*]} + do + mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps + ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + done + + # Replace xdg-settings and xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + + runHook postInstall + ''; + + preFixup = '' + # Add command line args to wrapGApp. + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${rpath} + --prefix PATH : ${binpath} + --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} + ${optionalString (enableFeatures != []) '' + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" + ''} + ${optionalString (disableFeatures != []) '' + --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" + ''} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" + ${optionalString vulkanSupport '' + --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" + ''} + --add-flags ${escapeShellArg commandLineArgs} + ) + ''; + + installCheckPhase = '' + # Bypass upstream wrapper which suppresses errors + $out/opt/brave.com/brave/brave --version + ''; + + passthru.updateScript = ./update.sh; + + meta = { + homepage = "https://brave.com/"; + description = "Privacy-oriented browser for Desktop and Laptop computers"; + changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; + longDescription = '' + Brave browser blocks the ads and trackers that slow you down, + chew up your bandwidth, and invade your privacy. Brave lets you + contribute to your favorite creators automatically. + ''; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + mainProgram = "brave"; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index b7d974ad259da..c0b8d7cff415b 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -1,5 +1,45 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused common-updater-scripts +#!nix-shell -i bash -p curl gnused nix -version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" -update-source-version brave "$version" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +latestVersionAarch64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ + | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +hashAarch64="$(nix hash to-sri --type sha256 \ + $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ + | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) +)" + +latestVersionAmd64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ + | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +hashAmd64="$(nix hash to-sri --type sha256 \ + $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ + | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) +)" + +cat > $SCRIPT_DIR/default.nix << EOF +# Expression generated by update.sh; do not edit it by hand! +{ stdenv, callPackage, ... }@args: + +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) + ( + if stdenv.isAarch64 then + { + pname = "brave"; + version = "${latestVersionAarch64}"; + url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb"; + hash = "${hashAarch64}"; + platform = "aarch64-linux"; + } + else if stdenv.isx86_64 then + { + pname = "brave"; + version = "${latestVersionAmd64}"; + url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; + hash = "${hashAmd64}"; + platform = "x86_64-linux"; + } + else + throw "Unsupported platform." + ) +EOF diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4bd6e358fdf6c..df33a2bbe7571 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -102,7 +102,14 @@ let "flac" "libjpeg" "libpng" + ] ++ lib.optionals (!chromiumVersionAtLeast "124") [ + # Use the vendored libwebp for M124+ until we figure out how to solve: + # Running phase: configurePhase + # ERROR Unresolved dependencies. + # //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default) + # needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default) "libwebp" + ] ++ [ "libxslt" # "opus" ]; @@ -241,6 +248,15 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch + ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [ + # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on + # for our NIXOS_OZONE_WL (wayland) environment variable. + # See <https://issues.chromium.org/issues/329678163>. + # This is the commit for the fix that landed in M125, which applies clean on M124. + (githubPatch { + commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4"; + hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI="; + }) ]; postPatch = '' @@ -479,6 +495,10 @@ let for chromiumBinary in "$libExecPath/$packageName" "$libExecPath/libGLESv2.so"; do patchelf --set-rpath "${lib.makeLibraryPath [ libGL vulkan-loader pciutils ]}:$(patchelf --print-rpath "$chromiumBinary")" "$chromiumBinary" done + + # replace bundled vulkan-loader + rm "$libExecPath/libvulkan.so.1" + ln -s -t "$libExecPath" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" ''; passthru = { diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index c1d893e0cff91..29a46cd688c6f 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 nix-prefetch-git +#! nix-shell -i python -p python3 nix nixfmt-classic nix-prefetch-git """This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium via upstream-info.nix.""" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index ad3913aedb2b8..d75b5df530328 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,39 +1,39 @@ { stable = { chromedriver = { - hash_darwin = "sha256-QdL9KamluVX6kIIY6F7zxKL5l7clhsE7QWGWw4YRUtM="; + hash_darwin = "sha256-PmLV++FK6aCvdhNNhb2ZAmRLumr+VRFvN+7IByieEZk="; hash_darwin_aarch64 = - "sha256-GKqk6GMitz0uud65iPCUMdOtIEhmWyHPbtrO+V2f8XU="; - hash_linux = "sha256-QKr2BjydiP5D3T5becwQHeFmK0LMrIFhbssDELqSEQM="; - version = "122.0.6261.128"; + "sha256-6Ys1EMSLmJNNaWdPeQiCT+bC0H7ABInVNzwXorGavn4="; + hash_linux = "sha256-iimq37dcEcY2suW73a6lhgHuNaoqtzbAZCHkQP9ro/Y="; + version = "123.0.6312.122"; }; deps = { gn = { - hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="; - rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e"; + hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ="; + rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf"; url = "https://gn.googlesource.com/gn"; - version = "2024-01-22"; + version = "2024-03-14"; }; }; - hash = "sha256-BzLSwDQrmKavh4s2uOSfP935NnB5+Hw7oD7YDbSWp2g="; - hash_deb_amd64 = "sha256-SxdYfWhV3ZpiGWmagOM6JUfjAmU9pzFGDQDinXrweas="; - version = "122.0.6261.128"; + hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog="; + hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI="; + version = "124.0.6367.60"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="; - rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e"; + hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw="; + rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32"; url = "https://gn.googlesource.com/gn"; - version = "2024-01-22"; + version = "2024-02-19"; }; ungoogled-patches = { - hash = "sha256-YIJysusNifUPN3Ii2tCUSvHEe63RWlTrTdOt5KBVyK4="; - rev = "122.0.6261.128-1"; + hash = "sha256-ojKIAkJB/gfg6scCxUYNAGx4lsquAaCySBDcUCFLqSU="; + rev = "d5773b0fb696ef107cc6df6a94cbe732c9e905f9"; }; }; - hash = "sha256-BzLSwDQrmKavh4s2uOSfP935NnB5+Hw7oD7YDbSWp2g="; - hash_deb_amd64 = "sha256-SxdYfWhV3ZpiGWmagOM6JUfjAmU9pzFGDQDinXrweas="; - version = "122.0.6261.128"; + hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14="; + hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c="; + version = "123.0.6312.122"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 348050137eaea..af824112def4a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1025 +1,1025 @@ { - version = "124.0b9"; + version = "125.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ach/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ach/firefox-125.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "7c43b11a0366c4741a886df3053363c94750cf66383ba0aff2cb71a424dc61b3"; + sha256 = "c344c4b54b62ac7f1f5d41f1aee666402b61999114a1d2c33d1f18d319836ae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/af/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/af/firefox-125.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "965596ff2ecd105215109a83905fef667160c8dd891b64df30b1049fa1a37b6b"; + sha256 = "e69a6bbe83c8f1c2b9412d438de8daaa84b247ede40bf274bfce16c8d91d8e7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/an/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/an/firefox-125.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ce6888ab9def0bcb175ff85969e2f79bb3752ba222d5a49d48cd4a2dd6dd7c79"; + sha256 = "3f79e6acbb0f6500bdcc79cf35d94851afc89a58294c5f48e4fa6295389a4fc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ar/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ar/firefox-125.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3572d08fe8ce9de7996cbf7fd54756a630feedb7dab8ccc76d3de685ed083e51"; + sha256 = "dd3832a6cb08bcae90f6cc5bf2196d3fee1ba62ba618e3a872782a60de32185d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ast/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ast/firefox-125.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "41d371a5022da7bda11682b3743a0321124ea516b9b5eee606bcef894ab29aea"; + sha256 = "2e411ae04db3baa2b10c8fe4004f0023cd46dc50c3e28f1e3e73ba6be5a1e6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/az/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/az/firefox-125.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "7407e5c61c078aa81ca23972831284c93f49854c87ad4fe2d3830b8c57a85bd7"; + sha256 = "d3b472f51de3c31db73c19e8d76f3b376c53f5f6122b4d6640ee9249dc1e22b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/be/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/be/firefox-125.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "baa1a3947748be72fedd6bc39ae08080dcb44c0cf3fd0bb955a83fdeb43dbe8c"; + sha256 = "b658e6e89cc8e82735f66c941fde9abdffed882fa530734ef200cb0e28bc8c48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/bg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bg/firefox-125.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "8066fc3eb427e12a8455fddf81392b4ee67533e7c35a1e0e3bc91586d9e42cb1"; + sha256 = "f0604e9440e4d78d34bce1ff06e125bb4411c8081345e5f74afcba5e337f2ed0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/bn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bn/firefox-125.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ab5339265f72cd39a7baad0c2624c07a60461a5920335876236281d5cead605e"; + sha256 = "30c25ba6c3a496a12c7990a83348201b2dcd459b820ab814ecd97979c3034fff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/br/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/br/firefox-125.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "a16cde6d5794e8d389bacc0c0967ba2ec2889e6ffde072f4fcdae2bbfec3a56f"; + sha256 = "3544f5d274c05a2df5bc8e51b2e0ab886f166cc64720cce2ea1b1748c452c236"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/bs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/bs/firefox-125.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8df409347e6193a60453a4d1dece834d81d912b5d146a239c6f0ad972d3ba631"; + sha256 = "a12f08d89f0b2077040a3f8917dda9a09193a613984297a7395b926b9fcce347"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ca-valencia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ca-valencia/firefox-125.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "4e247b1e04831b226ca93d950675b391eb9c8b01cbc7cb8ba3b14aa9a230d713"; + sha256 = "37608aaaf55fe2f93dabc29ac711b4a1e1d7be521e99ad5c20347a43cd1e88ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ca/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ca/firefox-125.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e2fb8a04cb620ebfbb46a339e5c69a81a9c774bc55298512f9dbd3897956b3b2"; + sha256 = "6bd24aee5a121bbe27e0a8649b9742e0c0c1512479586fb3059c2391d0bd3865"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/cak/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cak/firefox-125.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a250530c35971d39113b0f51027c3012cb504428fb166f5c26cdeebfa4fcdd6e"; + sha256 = "e4aa2bb9a6e5e02327b31b150a549fb695e1f49f60a85f4b1bef5c5019fb1b8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/cs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cs/firefox-125.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "97763028a324a1b16beda6de380318e40d559afa62c187c988553f19b4a8427b"; + sha256 = "2e4730cc98751d9aa45f82605240953c9dad307e10846e1065c5adeeb2a54d0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/cy/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/cy/firefox-125.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "6949307e12b9c304ea215a9e0189c100a1e9ec983b0a9e74a33c3edc8d74695a"; + sha256 = "60179b3635afae11e0bb4f0523135183627b16d974d8aa93fb594723e386a887"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/da/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/da/firefox-125.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "86aa2e25ee590ba18b389e0e855cbf37a1faf2e09077ea8dd2a0d1d65c7de9fd"; + sha256 = "08b6d9ec3af57f9fc298baa2dde23ca3cd6ec1031c448735cc580d354cecbc63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/de/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/de/firefox-125.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "42af8b846e78aab7196569ba3e8c2624ddd0852700e62363e887e7017d7179a0"; + sha256 = "163e1daeca14555be4d01193fc6eae95d6e25062c8ebba4e0b8118ff377dcf62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/dsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/dsb/firefox-125.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "9a5bcacff8cf7a3d37eb2426c40cf18d3e179271be8b91b5f19cd43912a28b2c"; + sha256 = "f173c4c3d5b98efe37850ce66fcf91709211a0a2c1a401cdd96d5caa86684b0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/el/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/el/firefox-125.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6b4af67a1e0a39a52ac9ddeffa31836ed36d2a851eb8bb72c8aec5da0156dfb4"; + sha256 = "5af84ecc3f9f3a412c961d8686a81d7b23925cacb407e9c7c0684b078b1116a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-CA/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-CA/firefox-125.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2b6c2ef330a87924c42f19c12891cb7b139442236c068bb3bd73ddab05e29a59"; + sha256 = "670bbeb9d23086c025b2fdff3ff43d261e55120d2783ad43c3362ee0de84d27f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-GB/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-GB/firefox-125.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "e07611c188349aca7b95d6814d5a17faad9a62f392c170352f36c526dd2516a5"; + sha256 = "c0ae89d0500bdb13df19920f8488516e83920b42d2b5b8b115afed86ade33c92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-US/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/en-US/firefox-125.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "80208d269dc8d251a7f9f292a7a6ea9ad217189a01075ff6d77326cb0352c1db"; + sha256 = "ed5c38fdba8bcbc9cf1b1a87a5fbdefee45e9d2be5018a00b5b597cb33ff2c17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/eo/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/eo/firefox-125.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9702fd83903ebf37448b21e1f315fa27e5108e4f92537505ec627c9a5e9603c1"; + sha256 = "3ccfced1562a2a23144e851c4d115f1e1c97f197d10329fadc1064b749fa7a1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/es-AR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-AR/firefox-125.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f294f0ada275f211e31e30139cb9f5e2920629324094c453c516397377c6e62b"; + sha256 = "84db5118492d597ab68438702252ccd45b1e569b347839dfef9be02b90ff9e6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/es-CL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-CL/firefox-125.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3e1ef1b372ed076486d702a2f71e4faacba1bdacda212becea461e56249d3a4d"; + sha256 = "8e45adc81628d26b6c117fd7b2e5a5a4621bef7fe64065d7c0cef2fd2e989605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/es-ES/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-ES/firefox-125.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "316dfef93c73fdd951b6616b1503c574148fbd89df21b523e32c8b092eedec2e"; + sha256 = "615d10f77d0432a1b2bdbce98cb1df96e17735dbbf6aeb328e2ad0f332ae55d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/es-MX/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/es-MX/firefox-125.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3b0a857ec432a68e6cced8143a5f12c291895eef4d85a8e69876e5d4833791df"; + sha256 = "7b485bb17efe9b3ed1ffdd32f88be45905f6197b181d8b4ab4e5ab335284c456"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/et/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/et/firefox-125.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7d3c8b5c70b176207d4d71312dedea022a6af445dbba793c1af82c2d56da7bce"; + sha256 = "d561379114bb49e08f3bacbeb67fbd07079aff5877055a49af53aa7507b8aadc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/eu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/eu/firefox-125.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bb4175acf7bd9bfd3dac272f44ccc5a09d2719d711543de577d76a7e2aec85a"; + sha256 = "0b6874785fc39076a9d5a4da1aa0dcf1ce8586a1fb197d09610c1d8b6a595593"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/fa/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fa/firefox-125.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7b6b28ec5e65753120e518c80f2c5a2071abb5671687d47399c447249c3313ee"; + sha256 = "c5d3dcf22df0d39bf7d14992dcff180f9d1b8b5121d473dd384b7e735665ef92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ff/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ff/firefox-125.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b68f66395003d0b9e7a981e3fd73c3662b261525d1a56ce3ac2b199c8b263929"; + sha256 = "7dfe6d710dd5c77754f4b18cd507ca6ed81a10c714d2e113fa10003e74d6e809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/fi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fi/firefox-125.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "01a3391fee6f64fded0e71e7a4b46504f087a57e361584ee4e8c976334819128"; + sha256 = "b90d9c99bed3ce22f1fada29aabf141b030c2f8a4ec29eaae566aa17482474c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/fr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fr/firefox-125.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "cbeb8b79e4ce74c5cfc979ba078fcbef54bd9bd2bfb1682d577b2e23f087c37a"; + sha256 = "06026a38b497501eedb0c7aed1f110a3b8bc958d7b002472070c60266afbb5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/fur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fur/firefox-125.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "103f539947c2b92e6406215438c5cf221b3b5d4924d1d52c4e8de89902514e8f"; + sha256 = "e957395ce9b6153dfbd00537797a73cca0714e4d14df98f7be225ba5c4842804"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/fy-NL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/fy-NL/firefox-125.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "71a2940967b1e0a5e94c9450a19a4d19f797483ce4027cfc1b107db9167272da"; + sha256 = "5e18f6d538c0829a2911e2c8620ec851f1cf4afd6274009012e2e98901572e88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ga-IE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ga-IE/firefox-125.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ecdba08ea9be613e30a98379c66b841091d78c2273806c63d80fdd8ed6854385"; + sha256 = "64695bf6614a9f9932f851ef76a2696ebcec1f0f0c34bffe9c4bb0cb42b48da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/gd/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gd/firefox-125.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2b3136b63b6b212f14fe4647e4ed0290d74c367cf61f72f17a489b7c7f56a994"; + sha256 = "a24e0bd5314d6d63f9ef85b11be8f474db48e535d1e17c6eac45d51073724fc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/gl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gl/firefox-125.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cf31b6e777f8b1f06d784bad0f71662a98c895ca81db19867ad3f9907dc849cf"; + sha256 = "30ad8e7474dafc303d22f8390533c1e847a8ce14ccaeca097be185253357780e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/gn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gn/firefox-125.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0941773ba748f4e260f3bbc75c3267cb013b15a896f9860c8be2919e3f9f5cbf"; + sha256 = "f7320d7c4a7735007f3e011a0491b8c6379b0f5cb222db5097ca35c950f490e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/gu-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/gu-IN/firefox-125.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ae1acac2bca9503523487a6d856585d3259637f27ee00448e9fb2e79076b2f2d"; + sha256 = "e195b45447e89d8809e3b944f0899d5a3ae06ccc1f5b3f884cc66ce8b05a10aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/he/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/he/firefox-125.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "75ecd6720cb4a654bb05804ab7416409b6164f10e4b4aa77c0a903af486a514d"; + sha256 = "5f0d61c3ea28c1bffc241f7626fbd9cd14b2354bc8729cfeea32ddc0aa4e326f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/hi-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hi-IN/firefox-125.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "aab1937cf0047e1a5e3ec425536661e864360052cb8f345d0a306cc56306ff9d"; + sha256 = "d214c41e231a8fb716bbce931d96442b3abb4d713edca75eda7f4242495f720b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/hr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hr/firefox-125.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "87d58ee5b58748cd1d5503d1b74eccbb05025594152254da4797b896cc8d4def"; + sha256 = "5372a8e58fb691e586066559640a44dc6c4ece391de3ead63b477554aac4fe5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/hsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hsb/firefox-125.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ff04eeae430739e38dec8cf4fe0393236d727a3f3063334583ec4459e3983a35"; + sha256 = "bcd62563ce8e66b1f5363b79afef151b3584576c0e064d0ed274b831cc205302"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/hu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hu/firefox-125.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "93089763d6e59ff90354b571c3ed968b78323127f60db2a561b8a81788637b2d"; + sha256 = "0d75b991b41ba370db28aeb35491b42ba41385cc3a17a1d8cef3b6e5c681a5ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/hy-AM/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/hy-AM/firefox-125.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6a2bf12ff40b268c555e1e60bd5fc70221491f4e45b0a80444a65e3cf59b3d89"; + sha256 = "e25f813793f3ae14bf7d8152b034d9fd858ccc20bf7d04bd589122c7dfa6e55c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ia/firefox-125.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a2388720f253ef5e849e3f7e991d2c8e40a6cd8f1a621fd65b8889127f638078"; + sha256 = "f9d1ea389b150b10c6f8875c3897af7a03e0ae9604851d392230d6714f43cf21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/id/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/id/firefox-125.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b50e68df4cc4feefe02c6711381f1205bc8059a968cd10d99f8e29d539307bb7"; + sha256 = "fa851b2e29890feddd9fc77856e263b2f009a37e34fb873d7c88287329ceeffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/is/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/is/firefox-125.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c6c56f5e72239a460bedc1f4456150663aa2a21669b15f5415de85fcf33832fe"; + sha256 = "58e95e71ff9e72a6dff5cc58b9dd90d34ad46fd3791e8c2475baeba98aa222eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/it/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/it/firefox-125.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4c12ab2b441fa275763ea2b9b9016459be6c8d69c1a7d75fe973c66376c33742"; + sha256 = "1343be59b8aa78912587d3a53437b8c1ff54bd804d006e9d97beffb790525bfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ja/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ja/firefox-125.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e31d6eefa69cd3c21b7fbbd9f7697895e7a8626ecb1b678d1958eb75d005bdf7"; + sha256 = "3e2e8d99282a414a137ed5060b5d32389f66056e348e31170313ec38e7050ad9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ka/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ka/firefox-125.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "45195d539cda7475642ce647a6324d40664cf87d31c38599ab31881ad88af1a5"; + sha256 = "ae5ab1acef2688a2528f729a52485d9bcbfc503d206d21b9348c3731388af5db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/kab/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kab/firefox-125.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "cb39042868057a50760e25dbfd0a30ee2e5773be5bc2731ddbb493ec5a288228"; + sha256 = "da9bd1b96dbcda3d71d167623a0b3c489efb7d96a6499283448f24f71ba0b16c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/kk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kk/firefox-125.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "42b194001292ed4493507e104908ce067d4c8bcf437149d7ee684d90290ac070"; + sha256 = "f0f2ab2fb418e1d1849c49b98f4cd3ff7aa454974aca32c089162eef31091839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/km/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/km/firefox-125.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "dee65da019ff3d9084121f3aa21b41bb542fef148b47f589153c7cd13f91d3b0"; + sha256 = "401002d169a47d90dfbec657d87bc2885a668bb787dd2d3ac0db5e6a47645d23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/kn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/kn/firefox-125.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d3222e450129764c39733b600ba8676e616626e40a9a346c83d0b8310aa5e3a6"; + sha256 = "ed9a227b8e9cc65d8b12856626e57013bc00afc4fbae0458a5286e41a01b499b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ko/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ko/firefox-125.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "352b9ace4291b4a9c7dcdb8c1c9a6872a5dd3af4c59dfe83966b6d50ff90b773"; + sha256 = "1cb2dda0fb445e44e097c9c176f1410f2d01dbd6f87983d2aaf734d9bebf5802"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/lij/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lij/firefox-125.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2231f09caf902b7ddf07c102587b82a2d23a053873e9bf16f7bd227c9c14c89f"; + sha256 = "9d64f74749268fe6287e48225d2dbf62b7add07035f17d3d649bbda77b5ba562"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/lt/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lt/firefox-125.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "37731da6cfd74bdf9825d5a179e4017259c2fc2928ddaff80c14e51cc1e069c3"; + sha256 = "d170d89b3576f047d95accf8d6a09941f4dede8216529d54ff87183092e7a69c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/lv/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/lv/firefox-125.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b04162370cad5bac3694d73889a1f2ef353c2e18e4c23a40b45475b86f9937e7"; + sha256 = "eb82b0c7d9bddaed90faab23cb89be202199a354d089ee46ae6e756cb9c44216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/mk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/mk/firefox-125.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "dc2bd9d5409f3fadbf6d131dc1715cfee85d20889b8712047f889107d2db1ccd"; + sha256 = "aeb01c14cdc4c14a23411979b01fc5f11cb1b11cd66b75031cc9bf2391b27e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/mr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/mr/firefox-125.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e23c7e194f60a0c57d0964266912bf3dbc8deaf224be21e2aa2f78bc4e91314c"; + sha256 = "02e86be51a8e6769bec058ce2254f2da3bfcff8061f44035871b9efd53b4d511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ms/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ms/firefox-125.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "52194b3a7141b1d4f6a33a1e4fed9e7a2fab427f23ec86ed4bdb6854800a6c3a"; + sha256 = "b0952b0a240e42828ab093517aba3f9212465c586ed1e524e0a80cedf04bcac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/my/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/my/firefox-125.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "722ec645db5fa125dca908370eabfd296c3ec02066cada1b7619c819f2c5c823"; + sha256 = "104a9df768080d091bb4c5d5a389e7f2a761dcf82f1b755bf8a4c152f6ef462c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/nb-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nb-NO/firefox-125.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a992c57e34b8e6182967c4df7de4948a86ec98fc661f472c26779e6eb4864460"; + sha256 = "72844860b05b99edaf933933747dab23c8d717a64d2990b8f0af5c3d27455610"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ne-NP/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ne-NP/firefox-125.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "fc9eb982ea8861bbe993a8239b3c5c1cb688561f3b897bbdeff7a52ea5f167dd"; + sha256 = "a85df3885d24109c1d156ae9449167ce70e91a06bf3f02820e65f3e381d6963b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/nl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nl/firefox-125.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b14b6615bfa94362493b68dff3589bd54007189c5fdd3609513cef77b5c19fda"; + sha256 = "7f9c0a118663c5e32f6820384cda369461c4a59cef78957595c5f49af37b2cf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/nn-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/nn-NO/firefox-125.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "feadafdb046c0ada7a95ae25e43bdd738192af33311e8a2b009ea636cdf678ea"; + sha256 = "aba9eab27dd617622091acd9f4637d25f8c1b74f8b4ddbbc7cb64ee97e423be4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/oc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/oc/firefox-125.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "01658bdb1bb02e4618ad071cf581d0bdd7ea1faf6cfff6c0a9da354b3421e4f5"; + sha256 = "ac1560c5cf7680c535c0d3ba783083b4fe28516ba3a4f1eed9344ab25bb64aba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/pa-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pa-IN/firefox-125.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5cbdb9cb2fcac2ae356ddd0efa718eacf3192908f263e5eb3150f02debfa9642"; + sha256 = "894292de9a5bec6303e9865ff21d5f4d601fe5093bf816f079404d23bef63e7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/pl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pl/firefox-125.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c6e28cc310841d51eac51c08fc0cb3e57604afb6ffbe8dd8880a1c9b827809e8"; + sha256 = "4db19e52c3521457a97f5b90f134bf540cdf142c262f27997502c1c9b2a77440"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/pt-BR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pt-BR/firefox-125.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "837e1af6617251b758ad8f6c3343d4360ece1e7aa3305e9ccd1b82a73606ae2b"; + sha256 = "ed34def0ed1d8ce308c5fb5aaa31bc86c5b96aa09587696bed09f2f4e2517f21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/pt-PT/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/pt-PT/firefox-125.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7071ce0f62eb773d14f944ace010b59b5d24f863a398b690104b0b76fd4270bf"; + sha256 = "aa5729deb776cb1d6ece711e1a29d852f6600fd81e6bcfcf73efec918f934aeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/rm/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/rm/firefox-125.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2bb08722589366a455d2a9661240f5df0098463faf11a0fbfad6440ae198ef31"; + sha256 = "7d830af829163a49bc91b8c3bcd21f96f5aa877c16b6e19488d1b006214db744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ro/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ro/firefox-125.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ce3423bf88e7a06921b02a0f65097ea3b8e93bfced9761c9d6eca0861dbf2f4b"; + sha256 = "86abeb933c8f4b5ee8bf065f1b17dc8a62cb9f0f995de2718b5a36965beff40f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ru/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ru/firefox-125.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ac6090b4b935f28701f49cc91305f4f14a91f659a096effee11d5d68870aba37"; + sha256 = "6b3a15971b7b8086ae252ed7fd3a01fba45f373326f1b98253b526445383b436"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sat/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sat/firefox-125.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "2da995c8d8207f962c469799ac5484cb9ee5471eb9395b763e9765b6662e89a4"; + sha256 = "27981b77a30d8492c5f219790dbbd15205cdede25d3320fedd11b06d27789293"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sc/firefox-125.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e27d0f6557c6957c2d8d8f408529f6ec7f490faceb0317ba2c132f06cd078d0d"; + sha256 = "4a9375aa8a13ea042a4980823d3c53338adec15dfed9a107856f0b791cd11ce5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sco/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sco/firefox-125.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "da0fcac3efbb0d39b451339f99755c5c332a3ff41ed7ceed341cef41e59ab17d"; + sha256 = "79c507e3fb3f76a4386f2564021e58392e678a496875ad836b3141abfc5c0978"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/si/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/si/firefox-125.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9742830ecdd058b2716d5ae1062963095f2d38afe7e249c26c3d8dca65a07bb4"; + sha256 = "652a062f663b0f9f9b88fa11beaee5bdd43c0ce0efbef09d3a4f7f8640febb2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sk/firefox-125.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "367a76651c79af37b3af3720200df7eb5d04d4b2f5fc41d8eaa43947e5081435"; + sha256 = "0097047998a727ba637ca3815baa3c9225d541530dc1f61dac3b5c3f47f07553"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sl/firefox-125.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1b2e4efb4e0fe340ad3fb1624fb9f0808449ef948d3c2be47513bc9655382dc5"; + sha256 = "dae503138aa312d14d4f9166edf6f7727dc32fa8aab89f038f28514d558c107f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/son/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/son/firefox-125.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a2b359c7b2ace637a41c7cbc82efd8e6db5166f6aad6e0767022c6de8fafc274"; + sha256 = "d222c4b8932d40ca3e369efc6640fc451eadf85774a5988cb9596cea2eb3b938"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sq/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sq/firefox-125.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "68f6fbf343a557cd2b575dde808ac0293ea6d6f8b24538eeb4ed355537a2e44e"; + sha256 = "b4af76eae0bd8fc99b93cc2b84bf82b711a56aaf939bfbfa9b91dd12c64a6813"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sr/firefox-125.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c549642695a707a10dd1c5bde3e1e0d1c828139276cde8d7f64dcbff8fcae6cd"; + sha256 = "cf7fdd51186046d4361a29f04473cd963c8ed7ea0b6e5c87435013664f75f593"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/sv-SE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/sv-SE/firefox-125.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d2ee0857dc2266853208ed58c3d989fa391f731f70508c05502eedebed25ae27"; + sha256 = "4ca01747d4d58e4068e30a0910adb30b7417e9f0099fda0643c2d6cb6a674dd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/szl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/szl/firefox-125.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "613385256f1d18c794ca05fb70af2760b28feb91883e3f4d2d6676fde672ee56"; + sha256 = "093f2e5bebc9b56c263046adcbec0c70c388949c6303726d1c7145f082e56584"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ta/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ta/firefox-125.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "bd7eb5391b315d9038db3e36016d7f33a93bfd98de698dd2387faca9fe429667"; + sha256 = "ab841373a4506f5fc75b432a27891451174a314159683d60588dc686706a18d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/te/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/te/firefox-125.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "761a74f766702b19fffe08b779bb0a934c20c45acb0b053dd946226cd487963b"; + sha256 = "fb6f570fa87efc7c7b806a00b7d415382dec3b56033898d49308cca56a21a2f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/tg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tg/firefox-125.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "5cf706f277f19c21156dd5efae5d84236813f1919aa4dd1bcdada6f2ff239ced"; + sha256 = "740c51b2b8d923947c8172f3ca682a50a3ba4608d9986aa0276d9c74eff88159"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/th/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/th/firefox-125.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1ac336a9eac612129461cf7d734b6a1d407c04d62a50448165be75aca8f942e3"; + sha256 = "e68545dc159e09bc6e5b9b71f2adff5fb3b1e04d9b3215655df90ed93096ce31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/tl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tl/firefox-125.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "8d4ca81d9f545fd517810b23584d01ae9bcf22e256969300bcbcc8a4e950a478"; + sha256 = "ad9e56e649d1abe0b121422cfde5bbea64eab4cd7a6abb958653ec14343a41bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/tr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/tr/firefox-125.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3e8e4b23243165b09ac4a919f1c3b4dacfdb65b6f65338336a359ca312bfc089"; + sha256 = "4751fbfdab41dc742489bb37cc3c306a8afa727447124c3c605abcda75c4394f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/trs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/trs/firefox-125.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3138f8840e20b149a4e489e893fce817da803e3c0b6eebdb7c1ce666935c650a"; + sha256 = "03e0ed538ea78cf0e794cf8e3b630c23fd9c9fb6f84e80903a55a72927cd5f0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/uk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/uk/firefox-125.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4652d49501ef2b46e77a790b21b63c4eae7b3bcaa900e37aeff5654b1dc4e94a"; + sha256 = "fe1e2704f50e9ee187602d5ab2c48a6a9bed36f0484f58b35c089c26b1056c2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/ur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/ur/firefox-125.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "3289201faee8fcc77c9e88b778e22815f31e745000ba54ab69cd7c93e1e916c3"; + sha256 = "213f70f78079921d26c1fff7aa67c429889cf78d4525df184e74050460c95dc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/uz/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/uz/firefox-125.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "58ce5b9528c2d3fa4b3e189fb6a5b90191e943111a460b7f414dd2e44643bbd1"; + sha256 = "a994f6bc2472957bee8cbd04e61d44ffccabde6cd6e1e6190810b8b8f617f749"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/vi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/vi/firefox-125.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "92ebdcddcad2745804189b25d98629fbf4fc849a4cc24f22ea561ac4e94675c6"; + sha256 = "53c7af3af45c0b48f29bc251403c6790a36ee8b18d2d411aa00fe17a21f8c005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/xh/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/xh/firefox-125.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "81ce1a73c80f08f7cd8030d3adf033068a0148bdeb3868c80a23e90181ed7992"; + sha256 = "23d8e28070e02b6a57c3b73af9a963f644576acff5d596c6adb5c9a4fa916fc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/zh-CN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/zh-CN/firefox-125.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "46552bbdff7e4f361799c57abf1bb7882b515348d90351a60354a8b807179372"; + sha256 = "20734b69aa6528d67c895b0c31299b11e832939870417a3060c0e91c63514259"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/zh-TW/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-x86_64/zh-TW/firefox-125.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9a5f3fb5a6577f719638271b4032fbad5741294a6f21d909159a0fadedf92948"; + sha256 = "775a1d2ae1bf13a1c071cdbe7f112adcaf4acd3f487a16109eff2f163669147b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ach/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ach/firefox-125.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "93492e3bb102cf4497583bbed0c9ecdb6ff33d13b7938b9adf62d61662a26854"; + sha256 = "56d52f45f887ab8ea2c453c451ce06ffa50207074ea13c88cb91f64a933766c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/af/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/af/firefox-125.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bb1631e2fe9f62eecdbc89f4f7e3257de540387b8be83f309e685d830e0fe469"; + sha256 = "c54935b5256e20534233f48e76f6db85a876086e0f0638482e2e2e334f36b55e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/an/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/an/firefox-125.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a42cf032329e8b42bcabd3c2a89ce177844b19fdb9dc430e93bee706c5058e0d"; + sha256 = "7d18571a839b581fc7a0d726387865799908b7effdf48de674de5a7324b5ec35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ar/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ar/firefox-125.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "02f0eece3797d185ffd0388dfe6b7f01f0460aefb4e2dfbd596538940e3e5d5c"; + sha256 = "8d1c53c88118fe051c3a879bf8c2c4ef8753a2bdfe798f4589484b6c2e10d5a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ast/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ast/firefox-125.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "cbcb2b5ba02ff7a5339d0ca6573e20de52960e80e1b86ecfc697ce6bed00bae7"; + sha256 = "2855d453a4c09affb10d1df1fa28509fdb83c2a661ddb52d7dcc47fc441582ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/az/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/az/firefox-125.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "44dde377f3dbdd7ae3077070c89a03f0a03a47444f64d25daa46ceb0e8901eb6"; + sha256 = "37604b46b07eab4e8548d62dc46456f4316a6a6b6d90ad2e3225736bfb465d52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/be/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/be/firefox-125.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "99f6e3c5fe20505893df21b25d49a0c7bedb4a68e0919c842d1d99a36f3e3462"; + sha256 = "d5eb6679664e991c25103f9bd373d61d22f8e7a84d6e14372c6d809265253ad7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/bg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bg/firefox-125.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c42013487e3a6116bb3259c04cdf6fa2826f4e0904c4e85f9b0b22de3f20b030"; + sha256 = "8c552b4d5e99a65a585eff6b097aff7ece9a04e9a59c2e243406e9da752c9ccc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/bn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bn/firefox-125.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "745f09456b5dc59143200a68e7e8885a5b5aae7d38507797cdc864c71de14412"; + sha256 = "28fdd013daca582517d6db0198e52c3b23b4b88cd1a63acdd5b1c7301aad56b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/br/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/br/firefox-125.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e7051c27fe9e67cd9b6352a74d2549f660459317e578fc732b4acbdb61525486"; + sha256 = "3cd74cc500442edd471b4e74683e852a818da10078afc9a2c7fae2116d083c21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/bs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/bs/firefox-125.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "eb796ed5c247d4469fdd55dd985c7411e49e5bc8b316621393b8b3a4a4da6a8b"; + sha256 = "d74f1df7dfbfd915265e198f32d6335ca143b7920e7fb2b8a73d13d8d640a8ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ca-valencia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ca-valencia/firefox-125.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "60c0f457ca060ac5a9fa6cc787e8916c76c8b997bcc5ff5485896c175aa2fcf7"; + sha256 = "99f2bdd3c4f97cf497fc76936c93d4ec3e58683ecb2840989c3b308406045688"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ca/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ca/firefox-125.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2ee8b2084461184fd73f39060c73b71ded0ed893cb8a621bc9c7d52f4c6124bf"; + sha256 = "2aef3753c8656cc41d8d29e8a667596578ca72f88fb72f14e481513425e44098"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/cak/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cak/firefox-125.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "98da49eb1c8d7b051cc765068f27b2c89f91df9868bd516174837ab8661e0a8a"; + sha256 = "6410e5de36e97b26b5f93b2b04ac97dcb97f8bc30738e4a96875ae4d373d0f1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/cs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cs/firefox-125.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c9913ddf2823370629e8908c24b5bb2e5b3c17b7825335d2c861550e7df2536b"; + sha256 = "1f9669945955a2abce5c3c38803bd4c127ae9adf8949ebdf53cb3afd205b4fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/cy/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/cy/firefox-125.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ca1a30f44c187c00ed30db47467ae31b9c1736b673fb6c0040be7965ead492df"; + sha256 = "3d18ac42eb8a2224f1f267d4f398ec71def89e57568fcb66559cb7f5ab93f3a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/da/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/da/firefox-125.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "33864e418d31f6b97834316dfa6da45b09f641b0a75fc51df0719d79109f47f9"; + sha256 = "ec72a711a47e1e7c5ff0942a908f35db1ccd73f652a988333ba43bc322e38a88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/de/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/de/firefox-125.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e4189aea8248d6beabe005c1fff728d7f4d257be09e66292c692cfb3c4a89bc5"; + sha256 = "3f53ca69ee578d01cfe30fa5932f84eb51157abc28a6d9c96c0fffa235b4abab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/dsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/dsb/firefox-125.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "dda3775cfd122abdd84558955fc7f3f42f87a10bcbe25967092347692883fbf5"; + sha256 = "151ea9ef796fc707ca55cb4b682bbaae8363f5cc8572d4e439ce917c38930946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/el/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/el/firefox-125.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "889101e7cff127e355087c9096a24f988fe9a8836452fdc34cd46b5fdcd2c306"; + sha256 = "8f5c2be305f8ff83d5a05415747fcf751cb70e8d49da51f554ce628f3c7b94e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/en-CA/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-CA/firefox-125.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dae9357e9cfb2a65d316f5637f9ff87021c663dcb1ae0bba65dbaa1450aaec41"; + sha256 = "d9813f6c7f09b90f3eef95a53634ed7fb292bd4e4dd0d1d9eb03085c3cc864ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/en-GB/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-GB/firefox-125.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e35eae3c07c1d1c6be5a14de98aa9c957d04f4f1c8c7b5df50299c6f444e7b1f"; + sha256 = "eaa7a84d1c3895f5afa8d81194b936d0b2bcfd701bf94da5d06a95afcf548bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/en-US/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/en-US/firefox-125.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "963b1a93f00504d56bdde7e990874009095aeed7e04aced9a10fabec61f4e8d8"; + sha256 = "1af2d8d41483939e7e8a611644983be405bf42afe386d5e794e96d18c5c40de2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/eo/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/eo/firefox-125.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "4f0179630afbe926c988f5723acd1f0e552c5a02d284181a661a673c76cd3e4c"; + sha256 = "89ae418ce031b101206438b4064754c2d71fd59edbda1eb61d80c4612d1fe5d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/es-AR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-AR/firefox-125.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "72b035f0f9b671badd5d95572cd9159771fe0629a9943297f422d02a52bd67e1"; + sha256 = "279ba454c1ad9b7f62e94eee415ca2bcaa1cd4452307d2160c61d625247ce7a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/es-CL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-CL/firefox-125.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "215be26fd8c0c71b5b0efdefaac7e334f7889039d6cb7eb74d23dcadd20c2091"; + sha256 = "ddf225b2c97201e375913004e3329cd278abffae0aec3e33963dbad2d581080e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/es-ES/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-ES/firefox-125.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1a723a18c0bd3f55d8551230ed961237b0f98e52e2af4db8266d9ea1ae5d4d36"; + sha256 = "0b26dd7323c3b533a0d76984d2a7e40302579d8db0f3907bb801d1ee1e5764a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/es-MX/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/es-MX/firefox-125.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cf952c345280b5b337444d2f9627da41f2322af8fb826ed98b1d850b7c85fbbb"; + sha256 = "39ebd0d768bc4971a3d0bb14159e4df3fb2da29bc82b7e086542d8ff6431830f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/et/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/et/firefox-125.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c78a4331c0840f719ab901db99c2c44c69938986fdb0633e136516e1d9daf4c3"; + sha256 = "3139b8fe4dd94e3d2e662069ede9cc7c2f3435e7d774891a485f2b28c8e2e33b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/eu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/eu/firefox-125.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "04f280ca89b464ff5503cb28837cc0a87fb55dd07a0103a2b40a51af3adef8f3"; + sha256 = "8aaf4ffa5d9c315f5e0b183decec2e67989e9febfbb32dbe1935e2f403c3e482"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/fa/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fa/firefox-125.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c79ea24671d2b1b16f347b5c7a0dfdeb4c7d7c34644cbc10beb098397248fc17"; + sha256 = "1312c8b7af60aa772d966dd668a0081db4a70229de05c362ae63e0d18e619f1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ff/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ff/firefox-125.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fd946920493e24d14b5232a2c0c10a613bfcd8dc18a88ce7bcff4879ad627838"; + sha256 = "944fdbfa79b94e4fca811adf74d0ee4a3e48069a334e8d596c819363025e33ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/fi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fi/firefox-125.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "553f21bcb92d3a205ed5acf3f7aebdcb38e62d7f793a766f61dc72815c29d671"; + sha256 = "7d82840552072b9ab100b17222d0f4ef0ff21136c3920e9a9e75bd5c7ab651bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/fr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fr/firefox-125.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a0c80faa01f229061c1c319294935027b74eb418957681706279faaf677b8506"; + sha256 = "83b74222a01946da395f32d464136600afa662d67b9f4f29ec0cb25af2a8df6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/fur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fur/firefox-125.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "01491c1377d344fea6ea61808c547a5ead734fe835577968bea1e2736d840ec9"; + sha256 = "4444ea9359f4b5cf6d27a623eb067044bd3e65b334017761ea42a4cd59651f93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/fy-NL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/fy-NL/firefox-125.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "35c48e14f745fd78f0359d9ac2b2e0cd67ce82ee02b9d3d0180cf20d84e0ff75"; + sha256 = "156649d35ecceb71f2cdd0963035a408047660e938119183e7b4cae6f8378621"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ga-IE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ga-IE/firefox-125.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e7492edcbf50ddcfe7c513e403f68e78277d8859d831de8f9e9c43e691240dce"; + sha256 = "097d64c713311f2fdae7abf39a1a0e9aefe1f15c3d1590212c856982893a2bd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/gd/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gd/firefox-125.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "15ccc85cb308ec5c6bd55c5ee56cb971d74eef2815c5f4777aedd4e8af0c0cc6"; + sha256 = "f973d001c697c3eaba250ace22bab505061cbede236e29886f7da0702d395da0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/gl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gl/firefox-125.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "19cbd042c8020b159f49ce22544a2fa356b35c907b0369c4f1e09305fcb14002"; + sha256 = "7e79913ad4665d4cb092e1a2df60c973d5f1411a68e860e54b49365718f712b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/gn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gn/firefox-125.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "7ca1b6b23eb0e4cd636782ba45bdd5226f3fac2bb7b29faea9929d0081ad1dca"; + sha256 = "9a432f51acc845932474f8e34759c10c7846e14c2938e03ba439d75f8f2410f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/gu-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/gu-IN/firefox-125.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "ffa6b17f6fd6a5a8eaf37ce24d99caefdcd42319447421410f044ac25af21bb0"; + sha256 = "5c93832a32b01be515ae199a09ccd2f3d3aa2a93541a90c639a444f4e91effdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/he/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/he/firefox-125.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "ab1ee807216bd9398cdbeab7d56d381197cb12f94b97e45b1641ac223950697a"; + sha256 = "541f41dbc1aedb460a75f5f20f7020c803a30a2db500a737b7248c16ebd520f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/hi-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hi-IN/firefox-125.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "43dd861660f4b3f946aa8ba5bb5edac5dc2e746b74e85ce873334ccc29ad36c0"; + sha256 = "a6bacfd4871c8576e4bb9173d896af8d77bb6c7476df3eb602dc78a176401f47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/hr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hr/firefox-125.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "da26e5440ce4b6c4e9b5819b7520aef7540b0960125af413fa5926ce7982c9d7"; + sha256 = "4f80ab934f8930dfa0bdb7937e61103cfb79d337d170ed6cd3bd308cab7f28b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/hsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hsb/firefox-125.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "0dc3fb91d8c8e20a9e737486e4b602b2704e9d276d211ec2275eb19e83385b40"; + sha256 = "bdd0b4a3d723e2c165f65d585848c2036f022236be4b108b3449144d64f085b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/hu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hu/firefox-125.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1de706a0c5ece58240923d6cfe871c8e1855b8c5ac072c7218bcebdbf0bedd99"; + sha256 = "5fedc53cc3fd9587d725fbe40c13f63ca3b3b5818d560ec610945d0b35a87c2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/hy-AM/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/hy-AM/firefox-125.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "5082ead18dac334ca578a1055aa596f9e8c9b7eb9c03809b19896ce94c10c64e"; + sha256 = "6672a11e3eb3bf05070928abf9d9505fcb9cb54481c338d8f9bd81a8970a3de0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ia/firefox-125.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d97838a60c62379aea03d2ac18d0d4c72b40d8e29b1bb943d07fc63ae178cf63"; + sha256 = "215fc720b28cfed1030866e3a9e668587a5848414042ce5af290de472627e6a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/id/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/id/firefox-125.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e3e0f65879677e9e633745534f6a23f5dd47b9c3407271f62a49d6398cf273cf"; + sha256 = "73705440c0afc58584d6045d22a8a4ae3ba50d278b214eb86d3f3fa21400a201"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/is/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/is/firefox-125.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2ecef86b77b7e5bb1019a8306fcf5b400d1ce2baf841771898ce53bc92e5cb37"; + sha256 = "689fc69fdbb6377dacf07c1905233747a8dde9588ede378d6e24e55ab2d0f956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/it/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/it/firefox-125.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e86a237aff0f23cde0fee9b2125dd5cc3554be9c4eaa785f6c43a8ddcba4efab"; + sha256 = "4c02e1a4b814353c43bc9df9c817205ac95329eff0925b629c4aba54d4b1bbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ja/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ja/firefox-125.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "68ccdb39bc09372f4b28ba9f0e5452f5d209e1bb64c03296d1b2c2544643e687"; + sha256 = "a67e094199ca42002b76f5f2657b6579ddc28dea22c85b6cd6734666f2507d74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ka/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ka/firefox-125.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "791c826cdeaf5ce03f100bb6ed978fca907537089e37392b11680e3e58237be7"; + sha256 = "4090c415bd52544aba3bc03112d75c85d60f6648a621aef2b1fc98fd55d402ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/kab/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kab/firefox-125.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5a710023550f555df778eff9093478a977117ca630651b067d1c1073e10bc02a"; + sha256 = "512f9e1c9e78e888d06682c0be5d92ed04c4205ffcb7e129f8ac186fdcdb922c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/kk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kk/firefox-125.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "05c4f5d8276a99f8969b4fd301291fa152774d9feba54c797f4674859885aa8e"; + sha256 = "9f047e003a30f6fbe69b025b6ec0eddcaf9f2ebe89920d81e2d9ec6ccac9db2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/km/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/km/firefox-125.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "97558e105f39b531808ae952fed00d80a58ae81b84297d461a6c992eb81daf52"; + sha256 = "528ef891ff6364b94f4a34d269cb9065b80911a779910180ae26a3ae3c55a4d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/kn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/kn/firefox-125.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4e47cc05ba0471eb03170fe4d370055cee65f18b71485f7dcbd2423cad5f3276"; + sha256 = "44f7648828c93e5190401270fb2b40813376d4b63e09d60bd88d34002acd63ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ko/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ko/firefox-125.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c7039c22d975e9cc794a2d12c19daaf6ae6ccd631d0294dcec5a505bbc0084e5"; + sha256 = "8bb3b5d2d47fb8fe4e1640ff7f190dbb3e8c2e5df3ce954d09242935d6142fd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/lij/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lij/firefox-125.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "07e862a57af775897597a732181e0745cd19ad08116b1b16b22e29a8689251b6"; + sha256 = "168ba4b30162d99d6627d72cd1be0c3ee52a68518c3133834676f7dfa8ca4b9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/lt/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lt/firefox-125.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "98921fa3fbb3430214816fd3d438450f4868adf0c8b81dee82b866e409f6377d"; + sha256 = "ab5bb9302ec3335343d252195675396712e04174ce922642e88d61ae9e91aadf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/lv/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/lv/firefox-125.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "37554f0945e458ee5f34ed365857028228166d34554ba8f3f402dab5bdaae953"; + sha256 = "d0448e7e053614e8fcafb29e8c374fdb733992770506e0a8fa97e5e93166b128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/mk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/mk/firefox-125.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "2a66cd838cd7d015da4cc0baee3d0188b65c180cc6fbd237e3d9296120ac9c62"; + sha256 = "8baa80bdb4a33e2fc22224b179b4b5e383c6106b82a3d7761aa47a8e50989dda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/mr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/mr/firefox-125.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "80ef245a0d52034defade97698d5aa37fbafa61d1ff92cffbb30f7e555d9b2eb"; + sha256 = "029725d79e5b070e53196036605c805030f52c7a9c9b11b39666da8950066df4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ms/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ms/firefox-125.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6b8814a1e865e87c7b249afa991b4c3b5efc48ba4eb5e203309f16a7690ffaa1"; + sha256 = "4c502415b50a299f93b3c3a4ff5f740b6cfcabe5dbfaa67db2025d025a03dc52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/my/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/my/firefox-125.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "9cbfa0ef5366b2fe352c3b606cd5d73f3583178ce025988707a64e537628dac1"; + sha256 = "25e9f31f91e7e3ee83b85d3b01e7793941a1cdf3e35f200f14d1dbdbe67b64a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/nb-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nb-NO/firefox-125.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1fe4ba5041a247545475bddb9c0ee69989cca2731f0d5acddc432dfaacf22eae"; + sha256 = "d34db6f7582793fac80928b41008d3e55fad22605910ccadfbc9a5c429d0656b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ne-NP/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ne-NP/firefox-125.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "99113f86f822a9ba66d4ce7092b64a2d58647408dea3bfb9b811910066a10e85"; + sha256 = "d697188584025b85f5af51d0f6bcde48f08b53946cd5c3480e634309b4361479"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/nl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nl/firefox-125.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c5853687342251d0a5142a7aa4b7da32662bcc0dd4d02aecd408a92b660666ce"; + sha256 = "01386e3bafab95109939a485131083800c801914af4a86b197c4c4b79416d600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/nn-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/nn-NO/firefox-125.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "1baa3519ec4ad4eeef357e1bc4ef7d405dd7f36ffb2d2781394d124326eefa22"; + sha256 = "e8e0421331d93df112ecbe9a769bfb6466b772c7cfea616f9e7aabaf7a9db0d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/oc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/oc/firefox-125.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6481b052712a9f1f50bff87fc51514c305d741498790cbed67ce93509967e9f6"; + sha256 = "5e461f5fc46895d3e962f08124085610434b9b980ba61c44ddd78b703362904a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/pa-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pa-IN/firefox-125.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1fe525a7afa67a24dc0a1628db5fda2970b11780b49f34fdb0457be4dc7989a0"; + sha256 = "57fd046620762ab4e114dde80d34d7e5954df44e76733ac705cb26020e65447f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/pl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pl/firefox-125.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "7c94a1500aa6fbc5c7776777e2dc79b3bfc0a6a4428cdd627717b532924c1405"; + sha256 = "8f9a90346f5e4908f090f965c6e579b0a85cdfa895a304874671349c302e4d2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/pt-BR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pt-BR/firefox-125.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "90bbb91a00b3aeb1ca85a7e37cf9663ce93f92485aabfb345ab510d7b95aba4c"; + sha256 = "80fac4d4cdd0d501dcbd72a710c499b656b6f80a12b1246d3c31ea3f8d601fa7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/pt-PT/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/pt-PT/firefox-125.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b8954c17494b6dd83909f542704d326e1b41c986df8626a898e70c631fbca534"; + sha256 = "9fcee0a4e8a84bf307a94b91892741a3b5f1a7e1d8a0e230869aa6a5284fa624"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/rm/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/rm/firefox-125.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "382ab15929aa4368e88cd8f34c627a8f62fbdecc5d3b364e6bdbf77b5efb0950"; + sha256 = "f7e39bdb3d4ca6b69366a983a17fdc76049ee55878cc7561b813dda33b578c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ro/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ro/firefox-125.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a6157c6bba16f313500cb9a98399e786f2021b02f748847ffb01ce8cccdd7ebc"; + sha256 = "3363738bb741a890aef513571244389beca8fa46be1a89019e33ca4c7e0219ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ru/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ru/firefox-125.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "54861d108e28506e7a431dec32c03cf161a121247893088b8d771e55e36583fa"; + sha256 = "75377fa4fe3ab20d6f85a9bee69674419d119706dc62e8f9a43f1c7b8f92f303"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sat/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sat/firefox-125.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "8a633ec42f15312cd935e5641a1634361383b8436622bedd20f98bd88f9f4ab0"; + sha256 = "711caf4da6b05f767493923f6f5d9fa6cfc10ecdd8bc6f0b634a0b1e4ef0ee3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sc/firefox-125.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "c5869f7725a6aeea54d65d1b1001947424e3c92122f73f638f6288ac4d18982c"; + sha256 = "5ea83a4f67b5c5eb58d765998b9bfe9392886668effa1ef91d7a59be30f63a6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sco/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sco/firefox-125.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5837c92e934cdbc942ab9e66796c49648a935991d03c2d732f8e513cca1d2e7e"; + sha256 = "ebcdc5d3bd4ae75a9b75b1f6e2a5c385becf317fc65d6e90af7648c7723cd1f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/si/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/si/firefox-125.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "f366b9bfa1bab1f67467ff0dbf1e065af9aa19effc0ec60f2edc8b6f8aa8ca74"; + sha256 = "1180b1a4b66c33c6b4a4686832d7301ad38c51c91fe733989cd4512d9a363846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sk/firefox-125.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4b40fbc7abe60b0cea580b5c885ab017da1e474cff6a243e67f11ec2a0fd2f30"; + sha256 = "d40196fb37852a6f7271f957b10fe7efee0399e16c15156165a75e6eb897e99c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sl/firefox-125.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "159783be30114a3b84d1572df44dd48e6be7742b10e8e677e600fb1fdbf7474b"; + sha256 = "3e453a5f1f2cd162c322e1783c821f3d0c6c1a3029fad9cb4137460ebb416180"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/son/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/son/firefox-125.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e7ba20d55c6821523246182c05f14a0a8fb3c28aef1629b31aece41129b28337"; + sha256 = "66f8d948dbfe9c4e9e3bb98f4158651749e79c30383d659962aca9637ae13a01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sq/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sq/firefox-125.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2b5f59aff6c82a7fe3e04af4e78764b45605afd517b28008e364d0614f99555a"; + sha256 = "685c3f88030bc4082d13fe3b496219a591554d7470301b52a3b650366e4965a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sr/firefox-125.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e5b85786f60a2c4ea7e04f7da8b29c0e5cfb43e3681f4139b0d93336ac655501"; + sha256 = "47cb9c59f071dda48794ef0e5a121d711862ccb1f4c7fceb49b8a07df6a279e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/sv-SE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/sv-SE/firefox-125.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "36e43039a8aae0c73dbaa105375d23c16ca6aac3d624d81b15132a0572c2f2ba"; + sha256 = "5d513a96e613959689aef88b805d7ca72eeb02ba909122271381c9332f856647"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/szl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/szl/firefox-125.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "36763b922ae4bf434d224e5de03cc2c0dca783676502e99b9fa741f109ba640b"; + sha256 = "bb9c37c214cf988dafa50c100528168004783004e9c944c488fa69685fe53af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ta/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ta/firefox-125.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "721e0bfc90a2cbb760511d6cd266750ec81d9e5ad7a90504f2cf76ce91dcaee3"; + sha256 = "1a1911144b8877ef8d6c12bab468f29aec88a999ce8abca715a310fe2afaa175"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/te/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/te/firefox-125.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7e60c5f171ab44f6148585017e36612483cbfeda9a498d14d1b56e825c373086"; + sha256 = "7189b85c076a2bed2414f8e2378ae23411e112d6d2ca4018e2c1e0e8dfa73b1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/tg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tg/firefox-125.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "f152869602c519561b9090e3653de062c9dad9c1a1c23caa94a440456b4469ae"; + sha256 = "5ef586cf4d00f4c06510a2870e15971db40cb39bf28a7488979056f4ba67cb31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/th/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/th/firefox-125.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7b90349c71dd38d0eebde65031566412c2383447e088a206b75c39c5d235f592"; + sha256 = "eb5c44af129c8f5610d3cd8f609775baaa99917f62276c589044fbb4706b9d6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/tl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tl/firefox-125.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3955fc83c72ba27f6194249ea7b55b6b4f48421830e7a80c0255e275d8da65a7"; + sha256 = "6c4282f4a591dfb9fe6640bd54ddd9a226e0c81398e0fae3a870f183eb3bd1a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/tr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/tr/firefox-125.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "955b9c516539a5d129b4dbe75869383f364420a8902c404db53aad7c0e2d8d4c"; + sha256 = "7dbc7bec063f87f3f819be6bd6fb86ea391ec1ffdb5e37a851da12ecee04ceb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/trs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/trs/firefox-125.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d65fb285af3715ec5d8598135dc99394b592bd7ad235cbc62d84d435894d6d58"; + sha256 = "f07ac8d5971d46bbbbcb000e5171a90326dd43ddedfd380e5c16c445bd75a1e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/uk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/uk/firefox-125.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "46046c249f3af564bd6b23ae84027ba4467e8a848c87ba6ea650a08fda99e8b2"; + sha256 = "545bfc1e7747017e7f7455aa1cd0b49768f50b38c8d688e502970d153638d3f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/ur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/ur/firefox-125.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "48961110fb53d36c62d879b998e020078fddf0e5df18592dbb77b28d6f0504cc"; + sha256 = "06854c5ecee95ac99b5cfa60cd1613d46bd682e943faacdc73bc37ba6f525d2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/uz/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/uz/firefox-125.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "949803fe59204044decd8cd4d6cf24b36634cd915771222f0e174755e17c35da"; + sha256 = "b90820febdf7ad047c20a7fe30e451e28db57a4e37801a897769d3327e5fa1c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/vi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/vi/firefox-125.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f177c16691d285011c10be04c45cefe5d6b7549abb2d5aff95885d1a0e3a274a"; + sha256 = "0fc392639fab1c4355d81483901da48cc330f32c73219307459943369fbfcc4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/xh/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/xh/firefox-125.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "edd38d4d530b0816d5cd48dd5da29a90be8a1b53505d03b1771ee4c1176e92cb"; + sha256 = "c9a28f90105395816316f1e3dd530db01fa2816d28df72cdaf72ea948e6d09a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/zh-CN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/zh-CN/firefox-125.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4f3bb2184098c47b7265e0c7021e1e4d5affad9209373cacf623620b68972753"; + sha256 = "30b8b1356f61011d7d55d30517f64fbe000830ad488d9e7e3aec3f691483b035"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b9/linux-i686/zh-TW/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0b9/linux-i686/zh-TW/firefox-125.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "1dfb0dda88acfaaaa3643ba54779846571d2e6e9fa02625b4d1ccdf17f8ed722"; + sha256 = "d52898626df662970547ab0e9e407966dbed09e3c078f80d3a0a4552f4905b04"; } ]; } 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 7d0f68edc35e6..7a02d4c8704fa 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1025 +1,1025 @@ { - version = "124.0b9"; + version = "125.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ach/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ach/firefox-125.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ca0576d1db1a94934aee20bfc0cc2271e1796a5a470be3be389b037867b7365b"; + sha256 = "5763a1d8083ed8eb427559dae674d2d28de8d89bbbd34b7019ac560b08dcccee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/af/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/af/firefox-125.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "56d44096752f27f1a740cc9360d053de077bd1eaf1a5241beb807f3153f47041"; + sha256 = "35843e4753345b554047212b8fbaa964c9f551bc17bc74b675630ed7ce975743"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/an/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/an/firefox-125.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0b0c06acc195d8c23b443548dcb27b633fdf788f9a7bed53b14e04f060e986ac"; + sha256 = "0b41f5d40954495cb185e9f30784d6ce35202d1b28639c5a6dbcd63ef9d1e034"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ar/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ar/firefox-125.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "331fd76d1f3d876d5cb50bb49a6716c1b5dfe1763491f7d50cc7b5f49077c8bb"; + sha256 = "9dd02b44542ad9c672038b2c810cd4aa4650a0463ef3e4be803e64e44a78bb3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ast/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ast/firefox-125.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "60d5f8037c2a9eaed602baf846cc2bb0f4a44241d2539933fee475760dac5c5a"; + sha256 = "bcbc69b092d2b82a8ab1ec31e7514789f5b86eecb164a1893855b206547c7a11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/az/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/az/firefox-125.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8fd8673cc42a4dc88fe6aa3092e25e5a1f8b7fbb6528e36333ac05f3092120b3"; + sha256 = "a106c810bfe2225aef6b264e76d80938b4202c9bac411f50d8f1d0dfea8e8d35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/be/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/be/firefox-125.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a3b18c27d04bf744f93b895809cd0328ef8cbb2225817e583daff9a279712318"; + sha256 = "3126353bb4bb59d248e7f48ddfabfa22c4cc28d855c76dc221989be1a91e8048"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/bg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bg/firefox-125.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9ea11f28a8b26272a57d47a97ae5423262ab50ce63890512353b5760e7c5bb96"; + sha256 = "62091a371df3c8c592608dbc6ce888ed543cdecf481e20a69063442cf11a23e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/bn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bn/firefox-125.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d45b8130a38d52973ab6150666b452f912626971948218155a03a5e457959455"; + sha256 = "4c16ce4aaa860641e99b91a67b41d0e0acc249fc079a0e086c483fef14d81fa9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/br/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/br/firefox-125.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "50bb6c04f8e96e07d1fa4dd7f5b9ddb1d3c623085bcfc908b6f2c103813c1020"; + sha256 = "48245fcc1eea99682635271c2eaa9557772c90e4a64b0b05258919bc06d0adfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/bs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/bs/firefox-125.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0014b7b36a0b6a0fd9758dd11856a6d3c0daf0d80f0030bd32743ab705ae038a"; + sha256 = "b42fe380f2e758695f2eca9743482d0d2218943a2318df6ec026588513507f07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ca-valencia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ca-valencia/firefox-125.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "bf4d8fd79c2f641c5a8720a129e43a32bb14add3f5d4dec6f869326836f8b61a"; + sha256 = "d1e45ea220681430c3f797828c5dbfa49f6f13a5ad67d51494fee6ac2da42277"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ca/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ca/firefox-125.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c27fb9e73369f493d79c0ae36e75301d1a71af7cf6b19635e792d41ce40b1073"; + sha256 = "b9fd921b7ba24bd7cf4fb39e79bbd2410d515742477303e602d2c9b7c851ac50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/cak/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cak/firefox-125.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b8aec13900a1a003690c9bf18bec5398dd872caeb9d5825058642853de6a53b2"; + sha256 = "b963950aad364cc55e313bc0137ab64306e00d257a2aa04a9a005e28dad4fda5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/cs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cs/firefox-125.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e6743ed6d637e9648323fb403a2903a3807f54319f0171e9925624d5fb10e7f0"; + sha256 = "5a1bbf1995be530f85af2007bd78637e070220e49f4639f5591a6ee784b1accd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/cy/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/cy/firefox-125.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a5f3551a31a13f37ec4f4c31ce750278cf1dc6e092f8441b2e5602eb2acd7f4b"; + sha256 = "e60170253b00740f68dbb2bf89fef3ff4ae54728dc5663b4ff1ec2902861f977"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/da/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/da/firefox-125.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5a644ccd0930fbca380bd2a38409e0c21d5b2c58e48f5fd3cdec28fcee6cc0dd"; + sha256 = "e9917414d63b04cd67b36ecf5e042107cdddeacfae82cc5df812478e073c8db7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/de/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/de/firefox-125.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "09b461e436310d33d9d96b73e2116f267b269f9b16640b83ab5756996927d143"; + sha256 = "b74db687258caf7ea7cf5a0a25a456dbb7ce06de7ec08cf7e84b641bf468fcaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/dsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/dsb/firefox-125.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5cb0d75befdfc4ac756877104e93d6bc3e9480784fdde9b5d80a08f2496fb2b5"; + sha256 = "a63af3feb1795d1384754f739ed9c8264578cbd1245aa1df276b2bb1fccf0f8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/el/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/el/firefox-125.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7a70915cf7a4c71d9b5d27f7322467c184f4dd9c7a2e525a4f91e6ca685c780f"; + sha256 = "476d56afd9907e10b390ec24b9a32cffef32361ff2f53e82ca3dcb06d804e37a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/en-CA/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-CA/firefox-125.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1bab46642faad8a921ae8416365219572aede7f9beb02263457178053fc2c78f"; + sha256 = "f83776d4acede5b43b66a64361c5a0adc88118db0094d9f2e846baf93c17b180"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/en-GB/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-GB/firefox-125.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ae034b43433db1323dd0cfe4381904281dc665f2be50079e7407fa559a7c7a12"; + sha256 = "f38a1f63adb9a83611741d070fb383a358ceb281d1531e7df1756ac45e685d6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/en-US/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/en-US/firefox-125.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2871293ae280aaf6c1b0bb1e315412025c42ef2138f7b45db0b3e1b3903aea33"; + sha256 = "044ecea7ba76658458a4993bdde9f3ee11f728ee80f30814549a0650479918d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/eo/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/eo/firefox-125.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5e2a9c90a2ec4506e238e905068ad3254570f8a9008f834831526aa328a41b78"; + sha256 = "bd2c479b2713f6bf6a97a29a97af4c746c223cf8383b0b141562c641625b2aab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/es-AR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-AR/firefox-125.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1f7a773ad14d7307e29f404787c5590747744b194f4d864b7e366257425bf32d"; + sha256 = "ff04b00f2fbb4b141a457144c7004fb3603da8de4e91dbae8f8213b12c2bf62e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/es-CL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-CL/firefox-125.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "282e6b208273d4a059282942b357ed1f7441442db204b856b76eaaec23aa88a9"; + sha256 = "f9c123392943f120fc4da1db741ac37546c5f11f131acdc0ca3a78356cfd063a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/es-ES/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-ES/firefox-125.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5497d1dfc6f7ede8fc0eecc3c7fefe579c70a78fefca57d5f336d2ea9c08728f"; + sha256 = "613ddac4090a69282b6dd71a4406d5b6a8bd0c80213727f405a907a03a959a06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/es-MX/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/es-MX/firefox-125.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f6e24a15b3e6dc3f4189719f0fd51f99c2a77c83fe2251540c8520132f0a6a4a"; + sha256 = "e29803b3625237c89eae9fc822a9d0e1c4df787b05403c7608f50dd09b214e36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/et/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/et/firefox-125.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "f8c28d28b7110c91194ba7c57c981e3dd0d074de8c9bd35bddeaa509244b401b"; + sha256 = "8ce5eb6067e6ebe543edc7300483168b37e8517d510f1043fc3268eb6a974dc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/eu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/eu/firefox-125.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "466aba394f11ec741719acc8ed0abc88e232ce6630537b178fbb4080c4b9c166"; + sha256 = "17cda4971616dd4b94e2fda1f14b04a6732d7d696c70220a85df84d60fbf4e70"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/fa/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fa/firefox-125.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "117a46d6e0ffd6acf6d3e137c2d0a3c371c4f65c45a38e82dbf3216fe225041e"; + sha256 = "137bbfcc720f9b816b12cdf8411bd2b2eea9f64ab55a097d4cbd183d3d4b30a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ff/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ff/firefox-125.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "be89e945620de3fa32322dd7cb3997f908e47d16a84ad2de2e614d9261ebe29e"; + sha256 = "c83bb94bb16d6bc70279c51c1e2b437747548013d019434629b526d371ed7301"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/fi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fi/firefox-125.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "21e4a6dcb2ee7177de4470e2c4a275b4da07aa22ec08742c1e4e6f382072fadd"; + sha256 = "c4a6597b6c859a6aa8d34c7bf7223245efab431dd4d11bfc7211336b78a135d9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/fr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fr/firefox-125.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "608ebdb3157436b5ff3d541c596fee1a2fe928b036a2cd1468eafc2adcb85364"; + sha256 = "a36791d4bb76ff3ab44f4ef255904e354657fe9293fcb94d276063d430dde71c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/fur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fur/firefox-125.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "b99a19092b1f3469b9571beaabcf4be19eaf23fa308ad8273784e572dd236a26"; + sha256 = "a4380bfafbfe0e752d67f5797e592f3be615ca054b78cdd1afabab227d23bfcb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/fy-NL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/fy-NL/firefox-125.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5ab48a8942cd6569c243c596e53d0a62c8a00e1cf802aea32bce0c0221dbd864"; + sha256 = "0071da3213e18c38cfda739d00a546772f1726461ce0c9d1ca268137af1db628"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ga-IE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ga-IE/firefox-125.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7facde83e418eb88dd8b3b81c0a0eafd607ab72d9f7597bb59f5866a715f2274"; + sha256 = "e55e26f3f9c3a1326d299345177e4f44a088f4342b264bb039882495f2e66fb6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/gd/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gd/firefox-125.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c27346ed0660ffe2eab2fd278fad63fd8d379dd5774e48f355aa6f82abb1c5c4"; + sha256 = "92cfd3ae367a1dcd42cc8b6a206bc7429d3eabc26c4f98662894ffa904c27fe2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/gl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gl/firefox-125.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "98a6fbb6956f5ade75b7dfd32aa804522e8da11d9a884d53d8de8811b84b8f74"; + sha256 = "99032185cb6591ea1330c3e83d5e5fd5acc6bfc735eb1d50758224301e96f745"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/gn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gn/firefox-125.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "d54ad0042777757c0a925553aa3bb071bbb17b1b43c9aa3a85b763a825f6505f"; + sha256 = "2dd02e5fe5e49e7ec5fa6d29c88ba1e33ff5181f086620ecf0782936a43f0c95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/gu-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/gu-IN/firefox-125.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "70fb1ac009210be596dd0ad22f313920acf246b34008b1a605a2920efafe5f28"; + sha256 = "5392cb825509e6398de432d3146e3a6739cef31db9455aec3ad9c80fdbf8f48c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/he/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/he/firefox-125.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "98bf527c8f06f07928503aad185d502ce6bd80d2a3201056acec9ca5cf161ebb"; + sha256 = "43b5397f82010d596bd8d9601b2302b06b31d7e4fe458595ae28cbefdf6e47f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/hi-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hi-IN/firefox-125.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fd0b89ecaeb955e3a827946d0088b327cdefb11f0a59ea4a982ba9f3abdfd369"; + sha256 = "6d5cd029f6ea5324121c8ac5625b7fae0dca18a40175372f826ec6c4734e8043"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/hr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hr/firefox-125.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "00473bfacad73950fa5b630c356e6287864a9ecd71196a1be7f142e48320a0bd"; + sha256 = "e654f0e7c19eb8aa7ef774f83106a2ea0c2f0fe5574299b1a3245424de68d213"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/hsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hsb/firefox-125.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0d78d064ee1631b5f1090995bfb3ff42a3dee7f1cdd09e3032f7de643a0eccaa"; + sha256 = "3fdd5e833d0a781007d78ea4bb0c0f80cc51a36afbb22021e55f3136405a3ec7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/hu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hu/firefox-125.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "543c361d515f5b1a8a24d60cf21ee61e883df98066d3f6053e6059a32c2778de"; + sha256 = "2619bb98fdd5a1fdb66ba05124abf2d74ffd70bcd46e20381cbcf27ca34b1d11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/hy-AM/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/hy-AM/firefox-125.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f1080a9813db6988708774b84ce2465e816323ca59ba19378071ca611f486e13"; + sha256 = "521687b599c57f3e689096fecf3366351f4eb4416324d72cebc2da7667c0b2be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ia/firefox-125.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "fa5a1430c08687c3766c6f3b531a95d852ed5a3252c26c26cb554a07561e9056"; + sha256 = "61c341f8a29984f504bc0b6a236d7aa3871d5c7b85d136526eb91c7e8c89abfa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/id/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/id/firefox-125.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d7ffe4c519386070389cd9ce5ded3a92fc7552eab96e193a3ab2570c7aed9ac4"; + sha256 = "5c8b39401c0307fcc863fc9ac6df19347754bc0cbc95a1337fd6ffec8a0c6cb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/is/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/is/firefox-125.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f85744fcd07121633898f4ba37b24742cab02a1856ba2eba191f2d2e73f9eae1"; + sha256 = "f3db46c7e8dd670fcfb3b4e03fff7c058c391366e1271aa0bce22dd92544dcb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/it/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/it/firefox-125.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "101e5fddd72cb5444c02c5757d3bdf710fd4d862ca310f507e1b5e17ce8915d9"; + sha256 = "6d8648f7f86947640436b7f690860437b9aa23968f238c0de788943b50c18347"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ja/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ja/firefox-125.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "91513b04f9ceeb9ad2376fd6ae3a33b6815da84955b659dc40ddfe836d932eb9"; + sha256 = "0b0e74e3a132883deca562684e5ad6002779e4103a8a222c9d73744a5198e230"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ka/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ka/firefox-125.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5ab7da151cad77b8f6c1522cc9f9473ae3e7a1a0239ff32958030bd3d8150270"; + sha256 = "8113f606240b54623e6995d73c38375008b8510d586a86127a73d88f15c9d29c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/kab/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kab/firefox-125.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b4759aa9d6f9805fe616b4869cb72ea5d48e38b0f24825ce442aac0943ff7bd9"; + sha256 = "c1364acc20e9930eba1571408c5554d7668b3ebef7d481d437eec5ecb4d34d6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/kk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kk/firefox-125.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "923101ce3ad3e23cbdbf4b913ab88103d0bfa6d1ab80a186de38c898c34e0436"; + sha256 = "a3d4d4cb5dc5374ea732fc69a350f1263e12529e09358329e926bcb4db13493f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/km/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/km/firefox-125.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6d9eb90c4cfd630daa9a9b4d784671fc83e49670776dac885bd53dc6fc0e032c"; + sha256 = "7c44d1566004a5bb60239842c344db63d458d58ddad6bd1aba1dcbc1c2d50b49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/kn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/kn/firefox-125.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9a6b322a4c044d3af6db1ed2c59a59581a1afa6510e1689af60b7d3055452683"; + sha256 = "ebc55e0ec99fdbe237d159f8ca7dc2e8f12aefd6777f56e667d18684a77a0040"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ko/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ko/firefox-125.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a11a52d15b62986e23bbbc558b755c5dfe03a1bbd5e7dd169badd92e59cc0354"; + sha256 = "0f01a3973f7c56de695bb59ae2d5086a8c968afb832a2064ee66db91400f80ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/lij/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lij/firefox-125.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "799e2235e778f0fb5534210fa6e5d469f6f11fcdbc61db16d138844a4fd9c6f5"; + sha256 = "9d87ba2f9481706aa171987b997db8d6f46bf06d4b169f69e5176b2f46361300"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/lt/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lt/firefox-125.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fec8dec8ad8c194b8a31075588ffc52759937fc68475604d9b1fd7e46a852f4e"; + sha256 = "0c591ab551bad318e76cde71442b31e131e9c1384aa857e88a8e091b16b7fdfb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/lv/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/lv/firefox-125.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9ed71dd9cb4cdd99b39306a1b9f6851fd69f5ff0ce6c8800065aded0b453f107"; + sha256 = "83c4cb164524bdb06fec6663b47ec6ef8c4c875fe77234c3378e5a893617106b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/mk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/mk/firefox-125.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c16d868d88bf11c186825acc7fbc178565a09f85469903a9414f75aa5f3cc166"; + sha256 = "a16ad06e6cfa4f3423398017da2b790da75a7fbc07c0ea69b8608368636229a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/mr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/mr/firefox-125.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "8bfda16eb1227dee09f89db42821c61dc273f6a70bcf2f000579e33fbc09036e"; + sha256 = "8b2bd7a5eb289c8bdd3d39cdd9191bcc52373e0d82948337b185176057350dac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ms/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ms/firefox-125.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d9ce5030f49e19b5dc60582a9e6cd5ed65ffa9dcafa70a6235c9e3bcca3bccf4"; + sha256 = "5d417aedb9c82d764cb282b545af3a0861b450aa6c3b5a52eb1122b6eac5d0d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/my/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/my/firefox-125.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "d441b046609cc9094a8e843e7b0162777033d282dc2a2bce1b9a654eefc8324e"; + sha256 = "036be95f31d2c807c314f8037f7eb4d29636d51e624d2e4f7bd969504debe089"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/nb-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nb-NO/firefox-125.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "afd8bc36ecc4e937137fcec8581c486a545f8449c03e64bf24dcad93f4cb0ef5"; + sha256 = "3d508277cbd1c7f0144f4ed84c55856debdf46ecd12850fed41863666e6e9335"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ne-NP/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ne-NP/firefox-125.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "89423ea3fd0fb8240479d5d9964eaa5d9aa72a9e64adbab1ae6fe3e165d3c1c6"; + sha256 = "0b4a561c4a27e08686af8739a5156f4ee18f04844ba25797c1c04fdbfdf1570e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/nl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nl/firefox-125.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b27a8a97ca42f3ba12235a98c425d940b93c40af246e27e2d7bf34a07dfedbf0"; + sha256 = "1ce7061b04a54c7c889bb5d01f6c142f14380859be09c98bff65ac5997ea9b27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/nn-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/nn-NO/firefox-125.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c1654c81309e198bb0b4427149a7ef3570ff37db2f8d151b594a72546b8a4a4e"; + sha256 = "f9599b1bff9bde775ec288191f5bdfa3a1d9e0b2f8bd537d205f1678108156d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/oc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/oc/firefox-125.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a722687844e58b3d6c3c69b8e7ee3bfb19d0e471d637fd3d5cbf7df72e526eb3"; + sha256 = "63f2d7377795fa765465327e56fd40d2208d4d1248ce57ac148c2e9b394171a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/pa-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pa-IN/firefox-125.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a1d826f45898ec4c6b173baa98f0022e20130ec3c42dd3e4f4b47ed47e23e4b2"; + sha256 = "fc3a2cfc86ab632f37a6b52f68c6b3f8fd88b27c7d396a62e926589e187a14f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/pl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pl/firefox-125.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "366f45b67fc2c9d1f97f4fc74e07d94d082ca5efac0af269fbf41e91739cced9"; + sha256 = "5fce867b9c70330c0c73f24020adb2a822baf0781fde828e387b82c23edd31e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/pt-BR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pt-BR/firefox-125.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "b78c024a2a48084858501dc165fa88703610838ac38f9aa2dd57c3931645518a"; + sha256 = "7854d304aef9c0b91e2c116580a622cb2e3b4c856e2bdd953243631c4ff098b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/pt-PT/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/pt-PT/firefox-125.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "37278ef767904676b212065adfb9d3413979bfe9382c28b32b95d4457bd9d9c6"; + sha256 = "81ccd6d70fb796183871f57544de81b54a20a809a82376c24924c82b6e775242"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/rm/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/rm/firefox-125.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "db25366ddfc5f095066a3e8daf4e70251f8946f72f3f826f08147effd8820139"; + sha256 = "c4f015e71bc3e16f5a6d24c6e29b7338dd34ecf9ee2d40ccdb699fd688b4f7ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ro/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ro/firefox-125.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4ae9df2f509620416de8152eb8dffad3700efadc826da26d12d45aba5f44effe"; + sha256 = "ea6f517ac3c7c30a0d07aa9bc6f43aa64d48165bcb5ff4a59ba460305c317666"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ru/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ru/firefox-125.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7e2d2679b56fe9017e6f0d3bdc0c3e957bfa824f199438cc66c20d9e99b7110e"; + sha256 = "75d7d6d46808d100e83490ce251297e813d182479a8160f9283f7dac22d9df3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sat/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sat/firefox-125.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "63746e901923df25038677d55dfc5217eb42375585ac99191c078c11fb8273ab"; + sha256 = "73172b38d03c036b5c96e7d4ae2cfd3d1e1ca27e6e9970c434722083065e3c37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sc/firefox-125.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "483159365e7be54619431ea55a303f469588b359c155e812dee88757bf211d5e"; + sha256 = "1757e66e8287439ee4e792a332008c923accbca70aa091800d0107ed33b49fe2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sco/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sco/firefox-125.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3ff490ac141ca6f720c53bd6d257fd88919503ec97915e452c315b3cd34c0cda"; + sha256 = "014438de65995412947e4e7f36a4c03632ea16666d3ce810d663534b307f3c82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/si/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/si/firefox-125.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2acf095bcd1fa39b5d2bd21c3dbe51a733826ec502ef46b67f20d23a0ec06e0b"; + sha256 = "5f53868cf700ff746501302b820700542b5bfc2ad40f9db3baef08e0c4c1f0c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sk/firefox-125.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6bbb0a482fa8a4618ecf78775745dbb15edf0b4a4a69693288d5f04952904615"; + sha256 = "c0aea479860022b95edde68a58bdc7e720a8274a53019d0ae926025cd0ec3fed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sl/firefox-125.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c2f0e2d7547daa78933b056163eb0fd34e418730f3c2c74c94b30bf48cf87c2a"; + sha256 = "74ea3e505f41a8fe1c527bdd7642aef0cfc39d7718a6eb277380dd3a952c9b24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/son/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/son/firefox-125.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "12b16b72dc609059dbfcdacfb180738681f66d48e92058d4c40df404c696478d"; + sha256 = "feb11969767e697bec405c77e80c9267cca92c8d3d486e176730a68e3b34699f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sq/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sq/firefox-125.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "313ef2bdb1921918a40a3b8fff599868a136bfd1f3bfb576a5919c2b85b25222"; + sha256 = "f471f651aaea6db472408295c86b9d07c8d554a42e68662ee42fedd0d97465db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sr/firefox-125.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6a7c5a7a7b869739028fd1bfedbfb1706eaeb403b1e4fe9df987f07e0ae95d62"; + sha256 = "35d161eb1933458b1c0dff11e4cec387a1e190c2da6efe80441c7819a0eb005e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/sv-SE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/sv-SE/firefox-125.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bf0ff133a4a5692f4ca247d2205a2031ce8f2d6aa874e258ef716791fbc08331"; + sha256 = "725c451b118b76f4faa4bca2be8ccf2085bac6e1022421d5f7f8701b1a96addf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/szl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/szl/firefox-125.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "fd116c93a3f974562f9f5b931d5c616d382769e75878c80728787655bf1b35bf"; + sha256 = "e7c62582be07fff7b98142564e248d05cf5b9c4e38ca6bb4910bcb3504ca95c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ta/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ta/firefox-125.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "47ba7649a4cb89e70d52146844e3fa68926ffd97902c79f57bd869b1b980214f"; + sha256 = "3a4b492c5c9805d2fd39f7efce9a926200347c857a5c4b556fe9146a783af14e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/te/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/te/firefox-125.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "2ba93a6e4ae9b7b9bb08039444eb08241f86ba96c950fd4b6b100c1cb20499bf"; + sha256 = "ab334857e420a93f95fb1273a1d54252992b185dcfdc339b0b4215f768520d7d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/tg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tg/firefox-125.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "39e458e837690cca5b0505598ede9816e7c67eeec23921aef3b7699e02da6fc5"; + sha256 = "a12e6605636f8c70db0e14213a68087ac089c94fb1bb68829c029b59aed076a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/th/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/th/firefox-125.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4e28d334289c1c6ffdcb0875f37c94f14fa6cb8cb8ae4899fe77c702cd864280"; + sha256 = "602669936f1bd0f9dd8d0dddb303bbe5910df5e7b43bf9de09daa06163fc3e65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/tl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tl/firefox-125.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "98f1a24eabc18470fe61716b443f6c14a71b60ba7d5d76b2835de3f245dddb0d"; + sha256 = "75008dda2d18caa901a50596b4551fb3ea667714c1ef1d3201a39c3f3a539804"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/tr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/tr/firefox-125.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "0a4e497633bd958c4a4085e35afe85ed84f29a6c5d721da5f08c12c8e7d78a74"; + sha256 = "fb2010550552ab278008b45a59e78096b84fdf06efc739ce6f0a8b20ad3168c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/trs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/trs/firefox-125.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3d4fea578671a6640085cc9d93e349a6e7e8df6af6161781f5352f099098373a"; + sha256 = "69498b0e7f74dcb47ee0d7bf96cd94bbc647d2428ce9a328e2bbe7c3c33a7cb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/uk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/uk/firefox-125.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ccac4c155c0ade283f3883377b83dba9f2d76f4c5d77800ec2fbab6e19654af9"; + sha256 = "6d176a9adc95a6bc825fb9efe393f22910814e1680549f8b75435e637626bb66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/ur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/ur/firefox-125.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "b3388d6cb0d7142911ff6a1c64bc983ef39b20687aa46b754b4fc9b61030438a"; + sha256 = "6e21ac2eaa71cf1994f21ec9f7054db139503344b4702260a83e83471003734a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/uz/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/uz/firefox-125.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "45179bde9b59f9b4e95dc6cc82b6a0bc8626ef0d0dd8b65366a1b5cf5263e5cb"; + sha256 = "c0eff534fbc1ff7d1b09880498df980abddfd9540ad386b7b62d89552bd3a831"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/vi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/vi/firefox-125.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f1ca8ca7421c82c51753eb7f1c8bc7400ce9956b5602511b64d4c61f57b1080c"; + sha256 = "825f7eeb10a192cfd69481d1534de17814240d133f3ca90fc53f5719d4e87b00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/xh/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/xh/firefox-125.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "eb242138545a51c7ed325ce20b417b6d10c80bd09f57dc4702e6faa7f8676ae4"; + sha256 = "874a64ec14de047f2fe9b81b8742b6be39db1895b166bd2584cae6328ac45790"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/zh-CN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/zh-CN/firefox-125.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "27b2cb9f6da0e120367bd32a28e0510b7f2510b6070ae06c667a42a3bcced44e"; + sha256 = "21a8ac3fce56809cae9b8da6a98691561e1c929a44ca65025c4769c9944c811c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-x86_64/zh-TW/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-x86_64/zh-TW/firefox-125.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cddcc6a6596318db3520b7ca9195cb3473e82591d7d1bff03962ea0163187e9b"; + sha256 = "71722eabea75d8200c881549f0e04c00592b8c995c62047c34b9a30e8061fea9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ach/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ach/firefox-125.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b4a963fc7fdc4287574b83ff0a58c7721cf3f2e04f7e23ac8fe4ac9f70dfe12d"; + sha256 = "9d086981de24e8ae62b5e07c7bd49c9c64f86f388ad6fa5f53a8274400bc47e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/af/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/af/firefox-125.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "052525705aa718cd20bfb6b5b1c5cc58e090446279b2cfcc7a173ce2a278c17d"; + sha256 = "1cd8db9ae142d8f043f9b4978dbbaa671b16b7e3a5d3e47d4cbdad60fbcbab7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/an/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/an/firefox-125.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "edfedab6fbc70aef703f9448b42bcf4c6e4a177f01170af13779dc1fd331b43b"; + sha256 = "1d85f09937844989db25c498c3c7c9937c5e7d69fe0ccaeb0b46503ee9909bfd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ar/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ar/firefox-125.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "5728f83c6178b1dd8859fb45724094f40d7ef5bd820077e09b08768008cd7f90"; + sha256 = "165ae5280ec473aecea02ce552fd9feb38ef365a7b381f3b9f7909884ab54e0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ast/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ast/firefox-125.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "052b8820f884e706050fd039f95601bc879aa2918aec6a731ade044d1ce39a77"; + sha256 = "d2fff1131f320cf0a4f5dc279d1ffc2ece3ac239accec36a69f8c49b9a01593b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/az/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/az/firefox-125.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "f9cbcd6ab4ba14e40867da2b066cd791f9439e55f979ec0124edf16e58d2c922"; + sha256 = "df109da3ce91ad390546228eae1a758e9c2b25319f56e07ecc00a79bdccc8a5b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/be/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/be/firefox-125.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9cef760ce9f65ac1105b7cd5c19ba8930eb41f67553e6b60a5a00ea417236699"; + sha256 = "33fe571a5720680a10e36cc1ea6b82d988688ef585e836eb980686cf46260804"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/bg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bg/firefox-125.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d2cf48aaa7a2f4e9a2cba6c4473387b21831e252d3b1ac597500cc962a45843b"; + sha256 = "4c44a6f19d68e8310c878e5b61ed65a55bb98f5301edb3f37bed5537d156cda1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/bn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bn/firefox-125.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "00b0736eab09430bb319ccf1565812ee0d5ee8eeab6cbce9834e21d0f07718e7"; + sha256 = "439f37184480bb5ceb10683f5ec09a2c14c08415a5fcc900881358a8d857eebe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/br/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/br/firefox-125.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "81cf819acc6eaa9306bc3f520530fdb8099e9a04fc0f9a2f4e44055dc94548ac"; + sha256 = "5387bbaba61a75f27cc2018b2b99c786e9b8b987db46e2d2258aa2763a7ba052"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/bs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/bs/firefox-125.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9fd2d6de1e9ad289bb63a418cfdca1902c353ab28ae9d6f7f70ca17aff64ebb4"; + sha256 = "ce92070eecc7beaeaddf33c9913ad4fb53c265bce57da65bb2425d4f0708f8bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ca-valencia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ca-valencia/firefox-125.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c46cba2b70be8eca17850fb46d4882197f842bb72193f6c82225075316f4ee96"; + sha256 = "f96fb19cdf6480d2e2b76012035590fe19870e609e37af9a878e6f092be6bc84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ca/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ca/firefox-125.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e5bf3b147df40ca74fea69fe3a76c5ce9faf5658c340c7eca763c5a7d9b603e8"; + sha256 = "f27b3a855d13cb0b5804885bef0e4a4846b28bc894082411a2a1c8b7bdcb7f5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/cak/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cak/firefox-125.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a7eeab9ccfb765c159a47a5c8b96a960e7a6da21ba84064c822b2f71f20e22ad"; + sha256 = "ae73c70e989f72051315bc9d806fa123423670b961e865147ffaa1659b7b874d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/cs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cs/firefox-125.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "90eaefb4e6cdd0b46df08aa1a349ac91eb66c2a24f5ed4511926ac4a44e8c0b2"; + sha256 = "0f9b4cba23df58881a081f8d8744a851494c789100f999c2b3e5b033d9119d13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/cy/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/cy/firefox-125.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6c13e1d8333f651af5c66cf235b030cc0a9586478258585aa018e4ffc5a892c9"; + sha256 = "0179610fea890c7ceed80a8574386ec13b68b1963f072dea2126a292e563ce02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/da/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/da/firefox-125.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3af9a65e281a0b66c3f70de6555f497b481f954f115a1c8a2415719ee96d205b"; + sha256 = "9368c56a199166d1f55fc49fdd9e4986bf7b73244e28cc106f73b89c1daf5b37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/de/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/de/firefox-125.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "482117c7cde7453908ad42c306b0c40147a1f8a58fab74c281174df520a9f5d4"; + sha256 = "5363cd0bac5d737d139efa90af240b6bf012479e3d03c74971da0f7022fb32e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/dsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/dsb/firefox-125.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b6137e4c31364e5575edc0a775a3f767520190342d2e8b51e865ebc6eb5878bb"; + sha256 = "ecbb204430887dc69fa251ed83d4a99a87e29b29ccc165d28eba3b76a55150ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/el/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/el/firefox-125.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dc841aee72e2a8b4716ef5453b842cc4bc45413abba6d498680aed0fffb7a003"; + sha256 = "0920af89c43bff2c2d942d2ac0fdc0344638ca4428a0c07a069644c8bbdc6960"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/en-CA/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-CA/firefox-125.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eefd152a6f0151ab0a630ac63a68b2cb2fb75bbcdc115e14774775852e758724"; + sha256 = "9474400588876157f7a6011cf72fb6ed3bd55f1bbc1a005cb032c4d70874bcc2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/en-GB/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-GB/firefox-125.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a7e6621e6722dc10e14adcb33757c613b5aba5b6f31feffcbff165734d38f102"; + sha256 = "3518d026bf2650dc9b9cc72422c7d311c0185a7a0fcb816bc0a9a862d491da17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/en-US/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/en-US/firefox-125.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "34102e7c6b7f867e0790d5c5900d96c99cc2b22da34683917142d26184260b2d"; + sha256 = "1f668f71ff86c4df65594711c3953b187b41bffbb851a8b13893190e370f3363"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/eo/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/eo/firefox-125.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "9093197eb6933c7701fc94f432a791058a7016ade38abbc7b0de7f2b82dc114a"; + sha256 = "79e0dce38ca7189af441f8458eea13526497a4d2faac25009d9a6cc63123b808"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/es-AR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-AR/firefox-125.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5ab13f7a1cdc4d7faafc59e4eec830e58e8429b35f03852c85874f6a0d8656c5"; + sha256 = "18092882072d6e7624055647e31a5e8e4fedb6f0ed85d6e75053e3f27605e71d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/es-CL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-CL/firefox-125.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "94bade79a35871a216e370075a87c58fe62bc44302a647e6d7e5d32ce9aaae3d"; + sha256 = "7c8048460ea10d281e9bfd10398d00fb977fb49438731c82eaa0dfa66316dd7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/es-ES/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-ES/firefox-125.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "53028233d603f732364155a23dd3219e96e22288f488c44f942b26263b8faa6f"; + sha256 = "1d463765bd15758ba17f5e2e5aee5a9d9fd2e596e7a8503a9f33ed6ea5275446"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/es-MX/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/es-MX/firefox-125.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7da87391da386ae0b22c30dc921da9a60617a7ead441130c7f427dccce3d7e2f"; + sha256 = "3f86063846fc376145ff81e679a668e8fc982fb46f3fc79b96c36a90222dde3a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/et/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/et/firefox-125.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c5cc266a59fe5f93b619857311c28ed600dfda4037841b7cc7a6b5e58a0368cd"; + sha256 = "ef540b8f5a4a30b69d5cf5045d7d6de6ed1bd99c4351099883c2983f0ee027c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/eu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/eu/firefox-125.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b4e106795b1213fa2eee2d6b3f8ce8113108470a67c9e55f02dc1423ae64d9c5"; + sha256 = "99994d762d77b2c99b8a9b4f19a4f033f3d923abd65954859474c2d6ced2b12b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/fa/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fa/firefox-125.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "db2a902c3d944757153273d75090bb77b905f3a4ca76f5d8a8161b1ce3952252"; + sha256 = "a5a729c2df188fdd6255c84b3a31ced1409a691f3983d12a1eb4c344bed6761a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ff/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ff/firefox-125.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b924bad11361e5d5de00e9923ac15c404d697e7f73732a4d2a1a7562fad66a0e"; + sha256 = "21e197166a2794b01aace690c94b2f5769d952bfb406abffabffa8eed21fb1e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/fi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fi/firefox-125.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2c633624382c54e6e1416184af27ffa6b19373e5a54ffb85b91b3cf54009b28a"; + sha256 = "da2b89ea1c67d810cf87ab8b6ce541a7f109f68f6fff326af1d7900fb925dc7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/fr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fr/firefox-125.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "75ad04058eca1d2eb8f1a24762e2a7cd93dc7b6fad82a8e00b21a114ea88ace7"; + sha256 = "6d0ab61a0d2cae6fa8c62d9ec20a60d70167fe5d01bc3d32e80f957d1f4e0c6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/fur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fur/firefox-125.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "9725a98c81a993a457ce826f64140d407ce483f93b2fc4388a01d7ac7af700a1"; + sha256 = "f95e0b1cdb13ff8a31c255c767469b58a6696866a7061e7e96165e58625658c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/fy-NL/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/fy-NL/firefox-125.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "034ceb8f3f388b4ce2987a8ac5b2d00da81b4a9c6569e3768f5760c3a8a7cb2b"; + sha256 = "6014c17f7e1c17cb457e45ce1d61838b472e7102f7b6e9abacb8ac690acc485b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ga-IE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ga-IE/firefox-125.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b8ee0f66b325cfc11ddbd3b0603f99d35d090f8adc47a3c13780c5abc2e88893"; + sha256 = "f3e3e2e026fbc4fd161ed1239b1c41ca81f6b136ea70dea30811de4ccf679187"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/gd/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gd/firefox-125.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1d66cf650211a414e5d930ee0172918385538b5858ec938f34c33fb94aa2cbcb"; + sha256 = "dbfb29292881a31ed56567d91d02f1d2bf784bd04abad86be40228e4079a3b94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/gl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gl/firefox-125.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "efa650155843d69933125a921cedb62b7ca5b705fce589ba9236da0f66bf9ba4"; + sha256 = "9606813bb2e91aa38b525f21f6712f610a0373a81d98faadfdf6d29dd7c4263d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/gn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gn/firefox-125.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1013bf49a6ba761cc51c846119295abf04eac0d0fc242b89e28ff9fd30d539e9"; + sha256 = "cf0f0e715843ecfd2bfcdb0f191956bbe0db78bf670ca1de69db65f7d274bb5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/gu-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/gu-IN/firefox-125.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "29f3c6c30d399f79178e5e4a7add2d515e83c64b141eb5e3d66aab16f8755739"; + sha256 = "66a54bb543e22cad798c60a8e77eb2886e0f43b6a921acbf4fe2fb25d7314d97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/he/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/he/firefox-125.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "78ebcb72601370a931c34e049443649e24142b809cbcf807adea452a51f00391"; + sha256 = "ecd31aedd802c02094fbb448d83bf2d1741d8b1621b01abd0622a5457631778f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/hi-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hi-IN/firefox-125.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "3a174f6f414678f97435ca33cd7005c2843e6f35d8d5407eb77223773f870c83"; + sha256 = "dced5aaac70f3b8ec75352b3b9c3447cb83e807f10a362b20d710ba9df94476d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/hr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hr/firefox-125.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f53438b5c80225466da58e84856b9adbf661ac4ca6b5e2a02679e8e029bb2c5d"; + sha256 = "586f6b96dae0a673ed23361acc175b6e558594a17640fde90edf4c6bcdf7ad64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/hsb/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hsb/firefox-125.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a841157c15a7aebee450d0c2a4a31ded993d1d0107ee2150cd169fa4f0a5da12"; + sha256 = "19a20c3a835c74a41542bb4abb6349999e139d8416a39b4afb997ba4c9531cc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/hu/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hu/firefox-125.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7d0db8817e2f62226fe57c5e0037f9dabc7e85eb25baba85ab46799791f5234a"; + sha256 = "10664ffcc63716c480db7e7bc8d3be9a8c132bc991bddaa6b730d521705ca55c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/hy-AM/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/hy-AM/firefox-125.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a162ddab2b757dbf54bff6600647947dffbec8a753541de7af287222f34d4e12"; + sha256 = "21bda999dd6e60292b91768c49903a038b35f235b2f629e9172a2e54386d62be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ia/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ia/firefox-125.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "2e8e420811e609e99a02450d419389dd9e93690fbb7c5563365fbded390e8e16"; + sha256 = "4b3fae49b34f75d24e577ec54dd2f674dc702926549cd4cb07b8ba5db96760e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/id/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/id/firefox-125.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f69fb4cf9ea0810cf16e7c00502b9ea5ba8e2a82d42fb65274221efe68493817"; + sha256 = "768fc814f02b22ace4738c65b8a636e820b730e5fb25cc7b9d78247c1cd7625c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/is/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/is/firefox-125.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a5a025ea846608c7d7c82ae325c923e3150f8d19c9204ba1c615b47da5b9b3c2"; + sha256 = "ffbe571ee03705e1a1308caf968b49f8d025060154024b569bee0eb30524331e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/it/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/it/firefox-125.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "791a914233e4caac24300da91fd376935bee081f4fa312cb30afa13fdf5d64f2"; + sha256 = "258f7d9cd4db147f029accf0682d1240672dbe7d4793d2e6a4dc5309a46c478e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ja/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ja/firefox-125.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3d0436102a1cd2b5125a921b6f0dfb3b8ccea06dc333c259f434914ccdab8b2b"; + sha256 = "29ea07588bc6bd07945d404960c52847fec95a4f235f7464241055a057188277"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ka/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ka/firefox-125.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "68e916ec30342a12117a749404b5696e16c027f8c380976cbda6af6b655cc1f8"; + sha256 = "64f421bf8cb23882a69fa18a80cd9015f2958ee71a9f0f824f6f82999afe1b27"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/kab/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kab/firefox-125.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "70218c9926500b9f2d926d5bda536a46a08fe4b80128ed7946266a61292ad067"; + sha256 = "0f2d2d6479422f077d01421cdccf0a66dee75574c7b2997dbf592edf77e1670d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/kk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kk/firefox-125.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1456ca9fb9ff0767c703f82d61ad105cb5b1039f1944c38eee2bda708cbabb08"; + sha256 = "4696c0f2d27836d29a6f7db319c17514d0a46ee45b0939ff0ca6dfe51077ce41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/km/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/km/firefox-125.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ddf4216fbe6f2f3b6e2c3a682801a495e3eedbeedeff218f3a28fe70937eac07"; + sha256 = "dbbf9a8b889a985f1be73dfdb51bd9e629e4c965329365b621dd4d1e831f69b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/kn/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/kn/firefox-125.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "07250d4946e341f7c8fb0c48ef1d9b1d7570b383ac5c74e27dec0cd4d4a7ab7f"; + sha256 = "640815528fdf13c0153dbb7cd848c02fbf87559569d230832d7d122c2f36be2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ko/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ko/firefox-125.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "10993735eade68d24f4bd3af5518f48e3aa7ecb47819fc37a45791589f88a0a3"; + sha256 = "1be5eb7b33f8768b92b4ac2cb6b7cee41b0dd3eb3c5678f2c2ea7f066fdfa4fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/lij/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lij/firefox-125.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "8719c0724c14cd48391e2df741118d2ad1e39c46e0d61a2a172be67b262c36d9"; + sha256 = "993bcdc81177071962797bd40737d459fca462b7e314e4a42fba67b6ad313fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/lt/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lt/firefox-125.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "636f84a04ec13c448bfea121bbc28eee3c1cbe6cdb9f312551f65b9424b61954"; + sha256 = "f3da0e98af7ce7c8ad913734875f12d393b4f81797c7d35347f47f046b5492b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/lv/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/lv/firefox-125.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1ffca11e32a58e3f04a2a3888d898835d73e6765905ab9070e2b2cf7e5029359"; + sha256 = "731fdd044398ed0dc8998399b48c3c0b1d9aad775d6a9614000e317a1794e729"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/mk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/mk/firefox-125.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ca3f183e439010a1ad4a28dab669108015cb59571d8aacbb82cdab06c0c79abe"; + sha256 = "4d29864459d53b1050354cc94e8d327d36d904bd13ed88d5a416d70099e9476f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/mr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/mr/firefox-125.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "6de3ad834bbc0b59f296946a2dcc8b6828372a2d5e57edf79d4a669b9a1e7d69"; + sha256 = "baf9f8c8fb85701c6261231713aa03bfb16e1454bb8d511315a05445ff94ea89"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ms/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ms/firefox-125.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "05ca29341138f17db25c2e42488c5392bfb935206e05963f7afeb06bdeaf12d7"; + sha256 = "b6701cfa68387b1841a6fc05361f96a323de8dafabe351f03bad449fe4ec443f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/my/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/my/firefox-125.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "943dc29fce2d95acfc267d5754ea90c78d75e56e60d57f209b7123ca123e81ec"; + sha256 = "b29837b49c9311944ee42e0b0ea599146dca9bf0c64b2ad1ef4e323e63ba1468"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/nb-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nb-NO/firefox-125.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f076900cb0db900f537b642a604c36417cfb8b12388b7b82764e3be8f2b9a837"; + sha256 = "98038cf55a21d97a1603a6a4ccbdc52051a7e6722434528e8b5c67df24d7bc67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ne-NP/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ne-NP/firefox-125.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4ff60086ac6eac0ef810baacbe9f10f571920f4f55aac8f75aab4ba23d3f9238"; + sha256 = "88a2ad4828f94b7cfc2e856748ee6f12fe476be1547342c6b8368ec51fa4dc37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/nl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nl/firefox-125.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7b5e22c333ff8e0b9e78e5aa65297382a51d7a8ddfc7d57344b8202aa3496553"; + sha256 = "e811b5e21885d2b9ca03e799330767dbef8545bcfd4da8f9ecaec3a96d050579"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/nn-NO/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/nn-NO/firefox-125.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5e46ffeb84425f440fd44b95537e1c303fd76032a01a5cb35670c24e5135345f"; + sha256 = "b88b939f59b831a3029a04f4723f8f6cf533cba5d56595330aaa150630c873ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/oc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/oc/firefox-125.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f62ad4985a8b5a939457d24243ce975a6ad3bf4847576ba3aa1534e31cb88d7b"; + sha256 = "2aa29118d9b689008b00f77b212ebb7f6bbb7b565d39d0b0385785c6c4400c54"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/pa-IN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pa-IN/firefox-125.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7e53ad22d42a78de2d00bff91a78334f97ec28bbde27080e529cb5883ff72e67"; + sha256 = "d91de9a34cdf1cce105b29b441609d10478132d9969914b0dbea70781b166d40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/pl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pl/firefox-125.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "773dcdbad701abaa66d5593b7152ea3ac8963b3c75194bc8e4ca036062549518"; + sha256 = "6e079131a4608d605c5340456fc33b414772583adf13569cb278950ff13d2467"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/pt-BR/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pt-BR/firefox-125.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e32e5d252de997404c96883672e8e2c615a5a7d97c9f6d995aac3c6d270c5157"; + sha256 = "c108aae8ca4199c63e690db1072b906ad2e0c9c89811d1770c2c56a855811274"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/pt-PT/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/pt-PT/firefox-125.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "25982cab0cf447a198629b1a72136b11aa9909b9299775c243e5fe1ad82aabf5"; + sha256 = "802236cb4fcbf54848f2a5ff4f0e2db6b7c9c63bb48b96ced27b9edec8d59943"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/rm/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/rm/firefox-125.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "956d5d6bc1b449847e8cfff48be1d2f0d5159dcef821a3261bb27cd0afd9ce5a"; + sha256 = "0184e4cba031481939fd64afd8568c7b35046e512e3076a7e23f5644c72c3f0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ro/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ro/firefox-125.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e0c97d23c7ad0570bb2532ebc3d28b6466ce29d97f80568a792f7b678d920f69"; + sha256 = "38e67909d80dd0d04b937aeb64ff3b736acf083e5c4993d5d5bc30608f1539ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ru/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ru/firefox-125.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9f7b31b0ec019018a72eb808d405cad4bc27aeda48250e56df65a17899692c5b"; + sha256 = "327d465354b3447939e17eb7df52ceef2fb35dbfa11cae26f23ce81ed9c9d762"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sat/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sat/firefox-125.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "28b3ca606ecd3b21bc5705affcdc43538506b33a9b9a93da81f26062eff76dc0"; + sha256 = "4f52884427d43586a9fe8892da694b6aaf05e507779dbe08dad625f7b3bd6077"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sc/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sc/firefox-125.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "e5f99d12d3071a0b93d529fb16a8eff8dcfe5aeb54bbfec13b2dd0cfc95b6f3f"; + sha256 = "dff2e97188d7c5d3637c0923e09bc9cd3fc4a08bebdab78e4eac64d1d04f836a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sco/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sco/firefox-125.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "c001be4681202e2aada86152a1c88347e888d0f00f054b3c89d4c24d93fd53dd"; + sha256 = "9221f215930e32fff0f37a9853e394eea6ee1175e8502a0959afe250f66cde02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/si/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/si/firefox-125.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "415ca94036045620919bedb43003bbde8e62ba616af66eb8c573aed520a5d011"; + sha256 = "db518900cdcca6d4d682fb8a576b615cdd994a7814dba9fa1da408d25c2c6bc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sk/firefox-125.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3d9f799c1aca6e27280bc3d3904802408c8b6aab9ad797cebe375ef8817418ca"; + sha256 = "bab2bfd2c8c2c1c39061f3858c2f8ba73a0a6c77c719bcaf208c7b25badfb03d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sl/firefox-125.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c4bc6cf864c30479431c0d79f0775e35f1adf846c33227c1a4cd8fcf132f2617"; + sha256 = "2b2b9e20a735e14e0f71bbd7c3247abf3fe1a727cb15ed422ecc35dc9385c7ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/son/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/son/firefox-125.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2b564e998f381386d6a54722d6942a3e39213baea67061bcbea14430ad7e1393"; + sha256 = "eebd08c8e68bf3f14059c697b95db1f4848c981663bb5fda925a3ccc9b53c419"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sq/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sq/firefox-125.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "64522b5c753f849486427e2991ff89c0338808159cd20efa68b17f4b551b20a3"; + sha256 = "b1d1fdd47ab17c3e3033baf2037f4bfbc3bcd79efaf05aa4ec2fc9ff354f97c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sr/firefox-125.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6ea6707fda230b21ea495e7285cc570ed9566eebfd5bf04bcc221ce3e9c2ffc4"; + sha256 = "c84e48d1e38d1a81c1489ea8bb005a73fb1414e4bbbf5a3d752e941c49c6ff08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/sv-SE/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/sv-SE/firefox-125.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c150358ec4d8862943e2c5ea8a4b07c7c1e7ee7c2ff206900b58a1040b410e68"; + sha256 = "7d19cfa86db1491a60f0130e168e50a88ec58ab7f81a6cacc14bebbf6feb47ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/szl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/szl/firefox-125.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "acb4aeaba25bacc088cf0c0986b56304f07cd35bbf2c80da58ac6544fc99bb73"; + sha256 = "4852141d9e59065e75cb536aabf1ca90dc5f47651ce6e444170de107a5601a25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ta/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ta/firefox-125.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "07422d1465616cd76326d2211f4d340928f47969ecdc501e8f01855db6b0f9cb"; + sha256 = "ecbfc5195d4f2244d70ce90bd24fdb655488a57fbde154011dd2fbf92025f226"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/te/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/te/firefox-125.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0a35ab036dc2326826982052566e7e9739b2f7caa970abd6086c8c9c8e2e4284"; + sha256 = "5a9db29123d5942fa41bb8eb1e2f9b953398387b0ca81e8a3fe80ec127e0c53e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/tg/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tg/firefox-125.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "35b4465d7772fc40d9d349e4233530dfa1382b05e852d94a470ea9d9b176d541"; + sha256 = "f25ab1b7a77bc2a778bfb03236b5783e291d3183aa6cc4a8ab3b18dadd1ac69d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/th/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/th/firefox-125.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4e6d651f60695388b08ccb0b82f33dce5a23f6a105a8d9f6351dde0c4d86e3ef"; + sha256 = "a43149d3caafeaae374cb92f4afbe4092ccd25f2a3257d4a071544c466533efd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/tl/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tl/firefox-125.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1fd7d66642eda37f74d5151fd64c5f5557bf566c954b0e3975e1de28e7c40c45"; + sha256 = "04cbf4173f5db095edbf3684e94fdd4b8dd944fc2ce15996747a8598c8e17203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/tr/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/tr/firefox-125.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3505aa1a2856428db593d644862b782e0c829518fe51ca0fa8dc7041654738e1"; + sha256 = "566aaa2c06453123da73849f48fcbf9c278758e575f0e4ce3bf176e0d0be1251"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/trs/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/trs/firefox-125.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0390879ea393c9f7cd90385b192f937137672af5baff6c57a27ddd83c209f2bc"; + sha256 = "b4921ff0a777e7c429a3948a0ca68e8a18ed97654e12d4f1c0cde6f4c83b8ae0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/uk/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/uk/firefox-125.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c94dfc997f5c465e7bd70850ae8255f2271663dda76d6900bf4f99cf3e50aa26"; + sha256 = "882ddc7f09c6fb20f26d8cfe67e8b67a81ab27a880b91538fcd50971fb8982db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/ur/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/ur/firefox-125.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "7be9282d545a80f8ae792f63ab3df21a97b1662a1b2cc518f46d648f84b39c28"; + sha256 = "e0f4aca4913c2e9a501b5e0df399cfd472b32844d14a942ab4642d44d75d78e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/uz/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/uz/firefox-125.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ae55f396e1c5d3b0b56b1eb6f960f6606751e9aa8f45f7a33d92e4e55a2d2b3c"; + sha256 = "41b95fc670ad2e9045a46bc842f0c87e3964a2b69a8868ce058414eeda20888a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/vi/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/vi/firefox-125.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f3ec9223f13175022766cc837807485c40674c4d5a0de6d36c08ef1bbe869311"; + sha256 = "09d7e0b83079b68450a742af29bdf3f6b83abb0ee0b6a4e59d1a0ddb3ca33d88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/xh/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/xh/firefox-125.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6cfcd7d7df864e3ddeee4a23b3afaace7d63382c56b7af68ccbbbd913afe8a7c"; + sha256 = "68d1d333bb9edea2e16486383c331d8b8bd82361881d70e4bcc8c0fb429577f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/zh-CN/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/zh-CN/firefox-125.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c4105ac86984a8ee335ce69d2fd1c37161daa1a406cd50a2d89c1c3e12aca0a5"; + sha256 = "3c3fa07aa61787b6ae5e4efdf07705c583c3054e8e6e9b395b7fc2f3e8b76c5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b9/linux-i686/zh-TW/firefox-124.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/125.0b9/linux-i686/zh-TW/firefox-125.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7a13e761132398c1e3872e6b1962c616771224da0e4b18173ab5b7634d53b50b"; + sha256 = "bf4b9336c83fe1e9e86d657f807e20af12f13ed91e223c79a88c521db74bc118"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e060e5c2f59a5..60be29607787b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "124.0"; + version = "125.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ach/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ach/firefox-125.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f39b3f5246d232fb295ca6dc73a8ffd64e4414c2adebeceb9de903b871fcf4e0"; + sha256 = "c1e0c0a2c0d8604408c1a6deef3619afdee63e3ec6ed2a372b620eaf69becae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/af/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/af/firefox-125.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "61bc79302c07a1a36bf3cd6aa3605e412987241250678e864774e68894ccf1ca"; + sha256 = "eb3a8dda25571e621e8b4b44e521f514bf9dc42341d6658212c05b35854d311e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/an/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/an/firefox-125.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "a120d58ab89a8a907ad48751cfcbc7d67beab7a972966c75dc47d77441de2cd9"; + sha256 = "592d708dcfff3902a3a07d20d43927f43126a82ee8fb17e15841454aee490b48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ar/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ar/firefox-125.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c80087635d5b697436e7e930fc6f38d7db4b8f6c09ffa688c77eebe3f35ae97"; + sha256 = "f9111fb9b0fcfd44e8dac53e714f44512a4738077eece31c542b9013e1d05e96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ast/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ast/firefox-125.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "105d4644a8371b5c913c74528e0af69c3955d25096e49838d235279a4e4c6eac"; + sha256 = "f7eb76354add218b6fe8c30cd3a61c30ffbe4fb9a80d27c5d16420c0e61e79d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/az/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/az/firefox-125.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e1fe04e28b0c6d667b09552e205c9b9556796cb1b2c0113d1bab761f4d7bb523"; + sha256 = "8745fb82e0807bf888a6cce399cbb7700d7b720123ce4a6972caff5ccb677c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/be/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/be/firefox-125.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c0caca4126a88980bc8532f6c4d48f24dcdceea27c6ed4dcbf3bfcb19fc28181"; + sha256 = "d6725d8fe67b309058dfcf33951619e0f0b57b05e8dcdbf3d5f9462e3c903684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/bg/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bg/firefox-125.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c48ecead17f2a72492e1151a2c84e9e405bf6e0e3c10999de925a7d6ec9c0478"; + sha256 = "c66ec00ce77d7c0743c0ac98029b064b4cf21d70ff3b1f07b7611e60a4e9b575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/bn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bn/firefox-125.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ebb829d44dd86a061d00b3f9aafd82dacebff139fd0cb5b20ba858e0951a44d1"; + sha256 = "9cf7401bf5fc8be7cf30e3dbcd97fc51c8a8948f3ab31d9d311fc5dccd2628d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/br/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/br/firefox-125.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "acdb176562541c2efe4ea874f082f2cbdc51a7b9256c131eb9b7728d94898869"; + sha256 = "6648ecdfc1e7931caff9e3cb2fec9984d83a1f1b5298f3ea0f72b0bbfdb2abcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/bs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bs/firefox-125.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "097eaa691dda2dccae9b2b7618233a47c355136272610669e63da84d1a421d26"; + sha256 = "f2892526f0fa826666549bbf7412c0ad42a4bc74841a3c3c53f1965c24246f54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ca-valencia/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ca-valencia/firefox-125.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "784b4a8e9e10045a861b78d44c1e44c5eb2444b59e36ca730b0939609a7365c7"; + sha256 = "0ba73ee9bb67921fa1ab4ede7c8803a50e1f9991de703a0b0340d6d95e62b906"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ca/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ca/firefox-125.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "fc61bf03c525a7c579b5e725c74d5f2bf722a3c3a7ee73b423e016dcd602e1ac"; + sha256 = "445306c9e98bdf82942560d91b367fa623641c860531531e47062956bb12d944"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/cak/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cak/firefox-125.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9c718fcd31d610a1a038370b18613fe00e9f114274098d2bb022ddaf48112d57"; + sha256 = "b008e29144aaea98bb7617903df3d99af922482d03ff45d0079daf68977b44f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/cs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cs/firefox-125.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0037c5a35b85dc7e5ca453ed0bede8301c47ec2bf9fefad5ea4b97920212c70d"; + sha256 = "60eddd9dd435f828416c8612d42b64cde2d095a29dd0e38112a1467aae211797"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/cy/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cy/firefox-125.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a7ed2cd189f921a0d106f193e3b8d93b7431b25b0636225efebd9fe6dc008aae"; + sha256 = "b01de57e45b6d6c887a7c0caed9681a59799bf8864d6a30d999622c64758518e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/da/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/da/firefox-125.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c59f8b3abf879f18f55d9a481b4c4b8f498a7c18efeb68a09f593e76577c9bcf"; + sha256 = "1d855f06c7967a4ffbace2f65b14290a4cb9cfd59bd57660c6f98697d897a982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/de/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/de/firefox-125.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00446f4ee4628b3ef9c3765a754ae319fcc9a4ea315f0009e6be669841046788"; + sha256 = "88bf1866dcb4afd25cfa55f67e316f09d75ddda0012ba8d2188183c72e55f83f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/dsb/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/dsb/firefox-125.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e5e125f93717fa78108fa350b7ecdd482ea93c5b1f5e8893fc96416ed082930d"; + sha256 = "0637ff08956b7c76f36f8f3e7f3811acb3f8dc36a3948b9d318dd3330ba75148"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/el/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/el/firefox-125.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bc3c75c5467c7a950d2a6e8ce81184e5575e4421c42efc2f9772bf86d722c2a5"; + sha256 = "805d626a871401ae319f98f0cd0809ce4718d6c5511d521e8d15479a5bcf2469"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/en-CA/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-CA/firefox-125.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8303778cfecb2fbdde533a03d1e753b6c0e089e41a26f77ac78defc17f5e83da"; + sha256 = "f0f564282dfd392ee25fef3fe0e6a2057cc3d1490a0c63834cb9e066bc4324ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/en-GB/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-GB/firefox-125.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "eda3c8a45f5efa3c2c0591351d820ab02b8f702e8bae7fbc94e87efa7e0fcf0f"; + sha256 = "c869f6573e388c13650b1103f0d445be8e96c9b1cec4723d53e544669138af1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/en-US/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-US/firefox-125.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "788db377d7b1d2e77d830af308e93f98c97291d8ddaec44a96d82c591f1d4dd0"; + sha256 = "ecd3d99be21bc2c3afb6f1a89fc587adb3dcd2a4ef22f95350d461f86251ae7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/eo/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/eo/firefox-125.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a1f93b9462d72e5ece4fcc969d3e21b26b7af26317bfe2e95ecb7f208dd69a60"; + sha256 = "9aa8fd5f10d5464f7d3fd15aab706848dcc8885dacb5c3de9401c8ff23d7ba46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/es-AR/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-AR/firefox-125.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1c61f29eb457caf80fd3093c3c967ad8532073b0e7a2613ab54548e1406fa3fd"; + sha256 = "ae54789a38235c25f7147b61b661f552f109afbb2f21027392bbf14bc30d3790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/es-CL/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-CL/firefox-125.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "86a058cfbd71553cefacdbbb8b366173e31921624fbd010fa323227f9ee677dd"; + sha256 = "7624f5b01d859f6017f57b2913681b7c0ad92fecedb86a5a5282e172ee108afc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/es-ES/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-ES/firefox-125.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c1cc17c3ebfc4bedb850390eece3dbb92f639eb9e3637881beaaa56b99de657f"; + sha256 = "af56a3bda1dcc4be8dd16418be567c47625ae1880026d5e3bb35550352e50b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/es-MX/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-MX/firefox-125.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3222dad0329a0d40a642dd0d7beede5aadc78c8a72d7f9cf5d53c9f4d79111c0"; + sha256 = "e488a67b04e315f8e924b423e5a0f6779952737a057ed8f8e3cdd3b29bce02d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/et/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/et/firefox-125.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5a3c64f50f1433ab4b70b5551f598b9df8a5e47ca10509554a8dbee07070c262"; + sha256 = "3083bd8c49fae0155b7dc607bf176263998fe9926e4a3c2bc2d8a380190b37a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/eu/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/eu/firefox-125.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0d1134abe729d68c0967b8193c0eef6534dfb607765337fd38e7dacfaea8867a"; + sha256 = "cdf4f8928fd7c9a8ae55ef5fb0bf90667f19a77ebdd04d9cf1a15a70b07b67b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/fa/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fa/firefox-125.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a8595e84d315de92d33e1054a864d886c6a76fbff49ff60b0bb82641e5cb3dd8"; + sha256 = "bb77300367b2a59defc1ca8cdd2754398f5d5a669cf77dbe4b6ba96656d221ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ff/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ff/firefox-125.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "8a85daac2dd2f02d33a0a2d11166fcad8bd6b213eca85f41b59e0ec5659b62b5"; + sha256 = "526daa29ae65ba57fefe639c5b18d140fad7bd04093071e4b7513937bc39486d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/fi/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fi/firefox-125.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3fef874682678cdbe0c7873c48c62f5a2d729c7dd48611d997be212ec029fa1c"; + sha256 = "c642f7803b2f9aace0ecc500c3664ba7209c1ab4fc7f7c3bf62a4f368f5097bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/fr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fr/firefox-125.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3fef0b1ec8b572c1549cd3388f69cfc68188b268f572fe6dd216121d43cda0f8"; + sha256 = "32345e02fb215813bab7c689d95138e6a93f4937345e75b4cc01bdbb9c607de2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/fur/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fur/firefox-125.0.2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "bbe1629e10fa25456393f2ae0695f09aa39bccbd0a9a66e0eb39c57d40dced78"; + sha256 = "24ad3d7a2877aff268ff03c6ac08e0d0005accc1c22dc50d48fe7740f083f3d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/fy-NL/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fy-NL/firefox-125.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f33ab367ea0dac102f678764f6f55f8a70ffb6e1e32aa095ba5adef2e0622d55"; + sha256 = "4b11a2d6372e4ad66375681491abc94075ef05a8009f4adbe7a81762029ab5ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ga-IE/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ga-IE/firefox-125.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2e93370538f7653f59297a094ed23c26474d32f83a4b2ea62e055f7ddc42ce86"; + sha256 = "7bc49b1edb7300b362264c212076d7f75e7fd3feed8ab12dc5bc4b4ec3022c78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/gd/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gd/firefox-125.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2d1ec185607a715976a12d56f97999c28b76d593a5ca1f9ae413eac4c151d69b"; + sha256 = "4d2ae49ae50da5e093426220dcb5ff8e6e007503fd5526f4acd498b31c9770b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/gl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gl/firefox-125.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a38bf0c7dafd80eb917914e19f0d953426785ddb83b4bb287463582edd4ebe51"; + sha256 = "1a349bb943eea8eada319a3fd42ebb258664fbcf410dd7ee3bb3552200043b80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/gn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gn/firefox-125.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ba95884b784b9d71e3c84a47c4fd317c2159603e1a6947e5897748a1ca8a10f7"; + sha256 = "4683096c6963ae79480829f2bcfc24346cfb0ff89554b1de2237c2926f2f6402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/gu-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gu-IN/firefox-125.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "41cc4c90cb5452b6ad06bbe39fa8021e7519ebf6f9c0f5694ea422b32a946ba2"; + sha256 = "ce3ccfeccc8626d78b6ca5119d907960d7b415a4f6eb0cb1e8b1ce697234c9f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/he/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/he/firefox-125.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a6715b196505ad5eac6a5d1c18f4351efa5470a13036a34d53d5afb340bcbb7d"; + sha256 = "6319f2446945e15aa2918b45236d57690e3b4ceed65a847915d92f228eef4f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/hi-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hi-IN/firefox-125.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "02eca2005ad1255273fab93324224b538a121dc10560b5f11b69cc8ad9c78ac9"; + sha256 = "fb6848985b5c27d80eca2c8c6b877ca287c095d3b9319bee5ba4b72dbf5e00ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/hr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hr/firefox-125.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "967fd7722890acfd01abec9dd49fabb6c38c5c01dbc83063d2f9ba5124b3f47d"; + sha256 = "defb3c3e05b58525dde6bc5d8c2b0ffa096d6e86f320882234acd3564f394c4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/hsb/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hsb/firefox-125.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "eb943982bdfdbb6ed7e607766a0595d9a99b55d3e27d8fe9f2ab19f56adb5a89"; + sha256 = "a4fe13dc42bc37262e34c0f9a63e63e79b0e91614cfda5c84cbeed928e9c8800"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/hu/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hu/firefox-125.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ad04dc372c0caa02ff1264d3a9e0b489a7d8554da09ac6703681fd413b7305fa"; + sha256 = "f50c9778a1c83c30e31926f15bc00caa405041eb9f686a10463b64178159f0dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/hy-AM/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hy-AM/firefox-125.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b37a929b26ea254fe3a4921065d5509da24db427480d477512bc2f1da8e91b70"; + sha256 = "39684d30a43a314aef722ae757d6e2fd58af76c9861a708455b9df8eacbf2d5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ia/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ia/firefox-125.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "e79fa4d7b77789e9a9596ae2cb8691c17b8f834e0549d1c8bbbfafed0753c933"; + sha256 = "8e99811b2ee15adaf78eaecebb59c506e45b0402a052353d6007f5da7ba6461a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/id/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/id/firefox-125.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "de4f3d28ba974f87cfd0aecf5e65375a4eecb656099849222d52fe43bfabd88a"; + sha256 = "a53d77bcb75cfe8c0c7951711f9b11681fa5aaf20a2bb8ec6cf2198572624980"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/is/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/is/firefox-125.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7828f47f66aaff55b62f43b8d8f1ddde572f688acc57358838e52b0ae60d4bdc"; + sha256 = "c5b85b3e16e2d6300ed4f1196325630b53eb9edbc4688ee8187d6a77b641a339"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/it/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/it/firefox-125.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7a8298cfe0653bc3bb9617cea0cbdb91b712fd1636b86d1c6304ef8795810b26"; + sha256 = "3a70bc2b11b133b170482c88981b726cb734b9f5eaf0115bc4e65734f7862ce8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ja/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ja/firefox-125.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "46e6a0ed96c775f100ac00089a9d68d1532a382e94edcb7bb0cf199ddb82e110"; + sha256 = "a490ced3f87b4b89d717365b196b8c0a311da50ad0392a056190466ac399e178"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ka/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ka/firefox-125.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bed4644517ef533919d73830ce0f1e138a819abddbf48b56539c389ff390c717"; + sha256 = "02749be6732a88fa5593d4c1dae76a2626bb5ce516cee98c205900aa4b785ec4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/kab/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kab/firefox-125.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "72008a8b57fbe266408527054f44406f31adfeac9ba04402624c2120113f6af9"; + sha256 = "3a26d92fabc60ad584c98d8b21eb46cad94a4d69dd3a5a1c30b73d72a73dc507"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/kk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kk/firefox-125.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6d08ed99004ab02364f7480e45525cee5513949f66bfd37047cd739be7d523e3"; + sha256 = "0c68d4db9fec3dbfd240c211179fcc72a18fe44f6f4526f1520b9f77eca497e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/km/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/km/firefox-125.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e601614963a951e5d94b36b77878bbcc2efe7389141d612f170132366949146c"; + sha256 = "a823adbc5ed6d00c6611cef7278766ab67095d05df28f4feea74ac36bb35159d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/kn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kn/firefox-125.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "21c8640b26b5652bd37f84615eb63973dc5c3e459ba8230d23cce525b5a03ebf"; + sha256 = "4acfaf770e803a9f95d6538169864af173efdca5979b5e53e255e246b5bdfddc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ko/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ko/firefox-125.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "e8ca5875df5b7c4d9f559bffdecc2877a42b61749c1c294da8c06d059073e958"; + sha256 = "d7f9f882a33f3024173243960dd65165062a3e5fb72b76b413ba0225f0e82171"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/lij/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lij/firefox-125.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "6824d3bc95ab17e678790042815609164c91e3a8b63b28fe93f7a2a6fd023ae1"; + sha256 = "a6991f8be2d09111a545e39a1114ade9b51f1a4667f62267719b4d99f8312ab3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/lt/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lt/firefox-125.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ddf9f7c63eb665b8256a0e03a1db5437e56176780e6d076c9065c3c27939d4d4"; + sha256 = "952de896927ede1f4650ee45e1fcb3bb5ea28f81b9ae711ec8d72e6a15a37649"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/lv/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lv/firefox-125.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3b1b09bd52f16ff7d4b815fbbac71d8d43b8b880ff003dc9ab2ab6f8e6666ee2"; + sha256 = "1beaef01e6dc993450d0f787f80ad5a50c8d5288e816775d1c0ced012cea81ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/mk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/mk/firefox-125.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "758dfb2d40bd49f9e9728b3addc1bedad0342a199b70136675c4a0f56c14a03d"; + sha256 = "38ab05672f75133480c02c69e89364ea75c7fddc5cce4b38e26d2bbc49720f52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/mr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/mr/firefox-125.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3c96b52460b9ffda745ccc838e3ad51bac57156a80ce7e0e9cda46fbe8c57dbf"; + sha256 = "e4bccdf8b86959ae7037468886bf1b8bd0ce2e72b78fd284c2a9d01d7594b488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ms/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ms/firefox-125.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "820c4638451755748316055e7bfdc36196d43dc5b34db527e61ce5b672e6f708"; + sha256 = "781b8993cb31223f01eef9e1c1736fd65f88def01d5163015496c57c80a952d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/my/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/my/firefox-125.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "b990220974bcac11b2f60d8743185d648b4f5e53a80d08e48fa132444563f3fc"; + sha256 = "4de4a0f5c23f2ecf715da6d53a5db187f0f3a24ec96da65f3c3326fafc90f4cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/nb-NO/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nb-NO/firefox-125.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7c48c0db4de73205350b3bb21b0bf309ee305e5db2fd7d3bda52c6f6b084c63c"; + sha256 = "c3d5174d3b9bc06832f1db0ec52597ded859b10c93a8393f326798b9ca9a9092"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ne-NP/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ne-NP/firefox-125.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0e7ae270c66c9e3666b00d335e46fc055d3f833eaba74e5069fe4aeeb5d1c61c"; + sha256 = "74e4887923e23e564c8c9760f9000febea221a1a1719923fb35b5e8a274bc537"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/nl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nl/firefox-125.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a398f744fb064b5d14893a3e07e2c58bbf0e5d81487286c7bb09de248f379e17"; + sha256 = "06e98ab97d45d4f76ebd5f16059a87591de279b189dada428eaa31be5edb9e58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/nn-NO/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nn-NO/firefox-125.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1a8aa6aa5b92a986221f9420ae06f87b3345ba4639f62f1ef98432c78607c980"; + sha256 = "d4dd1f483f9f4a74efcfe70fd25473ae1162a6fbd30bd2dabc7da38d49dafd32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/oc/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/oc/firefox-125.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3a841434b969dc4034b5b06b56aafc638dd5901d65f6d3c39da9d219e84a3e76"; + sha256 = "2d2b7e612cd3c10fa390f08fcd5bfe7808c4563e79dec1391f4d88e103bcecde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/pa-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pa-IN/firefox-125.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "13020035e4f421ef4753afc0fd7ebaf5a39167edae2e827fabc02f430788275b"; + sha256 = "287d1f46526bc07d74a3317f7bbc7b781622cab1929f9265a439cf724d275cbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/pl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pl/firefox-125.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "68effe758cf789db701d1b6dda0205d7ecfb16f1cab0ad513d4aee39ab35f90a"; + sha256 = "61a04f0b259841d6855f27ce1272b8a5cb5bb63171d6b59185760f91ba55f228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/pt-BR/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pt-BR/firefox-125.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "65983b7660be7a4959cb2958ae567297ef076181e344b1a4e786be1f3ae15c03"; + sha256 = "bd7981044c90498ed6b69058c526378edac609456ee5bd17a27e2d5ab8aeea2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/pt-PT/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pt-PT/firefox-125.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "beae93a9f3817b3e38a23cc63be92689f8429bbf94cf2caf4bcda3ebd6d23316"; + sha256 = "845063d62e92923afdfce5f8cdaf830fc861e3e80d0f0a9e87944054c3af078c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/rm/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/rm/firefox-125.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "830649e615654e15eb35622f4073a7e8f766742a4b0b341c5adaaad0dc601071"; + sha256 = "11729b87358cdd32d374bb7097625d94d49c0f491085e0a338170da2fd5ff78e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ro/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ro/firefox-125.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "947b6b3a133b99228a1251b2ccccf864d027a0aad5f6137ee893244815edb923"; + sha256 = "5480b2d8bc4a3d820104c3faee11240ac8c1ff002ed5b784ed2ae3a39e813deb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ru/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ru/firefox-125.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6be9443d11682e92a599c0dbda2df6c83d01921c78a321750275c69d0a7cba26"; + sha256 = "be35c75aaaeeb2b8dc07a807ea906b82032e01e800e91b044a7c559039883e3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sat/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sat/firefox-125.0.2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "1af043c41a027ae15aa4023311762ea83d4a1b4d46a36c2c4a7b472430df8927"; + sha256 = "2b63b616bfba962a9c2382c59182bd4acb0ca44c693ccfde911449db2730820c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sc/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sc/firefox-125.0.2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ad9f9ca256bbb40ddf4b38b923f27edb848e38ec4498be1bd16a1fdbf488a0c3"; + sha256 = "478c94327cb3d4e51981a0a3adddd0b7f00ce8b54fd21e0b233277f0131941ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sco/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sco/firefox-125.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bad7503b1077b4b88cbbb5c6a5df554951348ea95e2e27ad0420482903e1908f"; + sha256 = "84721bbb09ac8036013d2ebd7d053b20531c1873004c67e8723bb7986fa18641"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/si/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/si/firefox-125.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f67a2aa5151ecbc0af1d76a3b3eb417dade55128eff8541bf1628f4c2c006e2f"; + sha256 = "fce4cdd335e52207980f1329ba3190ef224188679a9c2cd0c81b87b663953874"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sk/firefox-125.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "94a28724ca63b606868e8ccf56869ca0b0bfbbfd025a5586f6c9f727001517c1"; + sha256 = "9ebc5c03aed1b417efaf40103bcf41ef59d06bef081a37c40fe6f9ea55e625c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sl/firefox-125.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f50f45277bf8568f98c2952e7c83fa8cf8626b1a0976ad4ef3e75c41b15be5b5"; + sha256 = "f13472ed1ba867350e5255e3d70f83e0925116575e02a6846d814c59ab071837"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/son/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/son/firefox-125.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "91eef8de0346652b86d9757d9ed038203b65c7382ca4eb20f7bad580a1962d5f"; + sha256 = "6cbf423f1f464835d4f076f0cdb0910e7c152271884d686d988db048dd06992c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sq/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sq/firefox-125.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "3f6249309e8512d150afbf028b98588cc0697f328ae94a384e739265e0d8a41e"; + sha256 = "4bfa8c3be90651e0ecbac820fa1acc38ae5dd0916fe18250c2b2cf2c8f6d401e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sr/firefox-125.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6b4610cc742c1654117c08c07261c61cf0e6ce632659593d7fe7342d702a577e"; + sha256 = "b2405bdf08213345271a52e80270e45298ef66776e04947a5a38985a048b93a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/sv-SE/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sv-SE/firefox-125.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b7f92836bd14326f76f9d0bb672ba1c7bdc1b7a10acda271c7659652d4c8a89c"; + sha256 = "c45ab928dae8b4ead94cf977fb441df786aa6b80aa63a27ca6cabc66e8853b91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/szl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/szl/firefox-125.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "cc596670e2854d703534addf03e9a9c6bb467720ad51fddae8c1d767238068c9"; + sha256 = "3a7c420f68614ec9b2a2d60aa9027b43ad38b67f9317de24bda551a8d1af261d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ta/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ta/firefox-125.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "f09df98a9f14f860ce1d5b3327a05dfe8865b8683bb4676808ec9d9dbd15dbc1"; + sha256 = "1847f9234956a76365207d7b9ecacd594f67896a1beeeb3792038ef24b51a2fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/te/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/te/firefox-125.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "de8217eaf61045ed82c05c6a3bc950533c2058b94cdbfd1648731b45857b5b8d"; + sha256 = "13411399d0cb4993cec0cb5bd1d1dc2c24073620b9cb36d390a3606f4a251047"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/tg/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tg/firefox-125.0.2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "c79206214d468c8806c5cf9887c0f0dfdd169c965a5f3f5593e735177bbd1f66"; + sha256 = "7c477ad4e273bfd23a91e018cee8955e7b7605dccdbc8585285902b7f0cfdd6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/th/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/th/firefox-125.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9483d51da4e42f8534cba36c9d624bb3d2cf07b97b062b111e422673793dcc3c"; + sha256 = "dc66bbd288067fb256c16cd83025f3c5dda45a2e8bbbccc3deda72a62bed56f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/tl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tl/firefox-125.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6044bfbbe161b2370889ee8e0dc59e2edf482d61c13850fe8e9bd939eb461a0d"; + sha256 = "d198857dace1d8798a2ef09cfbb80e80dd5dfd5d6cf2d4427260b72726972ba5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/tr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tr/firefox-125.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b2ce82af9bf78ae918314f61b1b2c24a1761fd8e0338bace8f2fd73ca5236b7b"; + sha256 = "ffb9b7ffef7385bbfe53f2b18c8fff5c6ba1bc44c89a52e4db21d46b9bd4b87d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/trs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/trs/firefox-125.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9ecdd12546797cc318f0447a24a1dcf242da1604fb5a7fcea709f305814e9130"; + sha256 = "21078973238b093474fbc34c1b411f3a0ec4293da44215f99eb65e70d09585f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/uk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/uk/firefox-125.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9dd8e73d2566cfaf5b1a2dc1e8bb2704c2bc5adbbc18a03df2b57ffb44443709"; + sha256 = "625e545c4daed88fb87173bed12ac2d1927e0d38b2623b6e4a9ea1e170af3d8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/ur/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ur/firefox-125.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "18654a79f80ac511d52c2ad287732cfaf9a92bc8e0e60cc9d037c6bbd9174f08"; + sha256 = "f507fc9d121691404f427394736cde58fc57223c1fc2e49628560beb2834c3c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/uz/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/uz/firefox-125.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e10c99d2d7e63fde417410ceaaab708de1934bea913c26a9cfa3d120bd74169d"; + sha256 = "0a4a7ab783abf28c72d8dc05fb89d1c595e9cb6c4230162ffa61e56f9cd4a900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/vi/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/vi/firefox-125.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d724e5da25f97f945da99f59d3ce1a8a36e0ed163921e6812b9a38c74f94b12"; + sha256 = "c11b780a90868ad2a352c724eed2308e8f8348ed854773370dab467dfae1a037"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/xh/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/xh/firefox-125.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "05cdfb0e6501e2d087cb8d53a8be43577ac8d3b10b93965ab898ce6b4a898e76"; + sha256 = "196ba78639720766d7f199ebd0cfcaf7dd47ca81c15e19fece45a7c90ba41659"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/zh-CN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/zh-CN/firefox-125.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "32dd941d753ced0f6fa038c21d0a407e5c2503a3dac91a7125db2e6ec201b0b8"; + sha256 = "861c2b6a384976ab9b134ff62518e7bd9d52298c2020f7e8e93298f306bbb2d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-x86_64/zh-TW/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/zh-TW/firefox-125.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5e10762e7a03a65afdd3a71bfdce31459004c94066c8d55ab69d415b165622a0"; + sha256 = "a1994e5d0fab6cd4ec2e7ceb7406955bcbf3aae240cb8c5dcf2c10325a50d1d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ach/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ach/firefox-125.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "6cb81c5d4af6bf59f0eef7686895546f9f25178ea7676a0021930f473e8a1f23"; + sha256 = "c5fd729c3397225d4c34dcc3980ce7db50c4983e2d6b03480f1ba8c34bbfdccb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/af/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/af/firefox-125.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0511796fd41d91fb9facec4c87ce529fd29c9bcb1cbdd9280a6bbd72d320ae3f"; + sha256 = "2dd3e6ed95ed3ee56acbb8798b6d4ad0a4609b1e8cc711a778942b1f2ef91161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/an/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/an/firefox-125.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "4e0f2af55b72894a1738064f78d63968b4ef26112e5759d744db811d01f48c99"; + sha256 = "15be5f74f58a8e6b34adec1554e0be02ddd115cc4f44d1935cb9bdf187b90e2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ar/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ar/firefox-125.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6693582467b9fb74b42fd0b76c262d95488f739d451cbb89689347dca0ebfe26"; + sha256 = "d225f582cc7f4805815c5207961992019196b6c044a9c9722abae0e7f1a75810"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ast/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ast/firefox-125.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "4730e5c66237c2e9be32b9a01ea1385f25004b827262f4436972f93339c10ffd"; + sha256 = "6e94ecae9a7567f997f885c9e4d332b97c4f1cbc7df2f3c7cdeb61231aca5f80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/az/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/az/firefox-125.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d4f724fcf9d66ab0fa324251912467f0c6ef85bf2dc858414b443093988eb435"; + sha256 = "decbc3404707ebdef7f231adf6f4185f38fbef581b8def1ff4bb587e8973f0a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/be/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/be/firefox-125.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f500e2aff8f435b99a782aa953d21558ad1e95a730315e6d857414ce39e38d73"; + sha256 = "8422388e348bdff5dd6af1656a2e6270697b1427da851e09dd5a62e45eb14b50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/bg/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bg/firefox-125.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "30f381481149c07d30708f86ad543d17ac45efe95147ebaed647cd43eea38416"; + sha256 = "b14c60a8ff41875d183608fc9763e9dd24975f078e08797c7589f6ed1769d1e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/bn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bn/firefox-125.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8bfd9bf8a1a35b8dc1725fedd34018bf7bc4601b73ceebed3496847497f27934"; + sha256 = "941a7fc7677cb3488608c81c727ce5799a651bf1b76727977af81c31bd3f3e95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/br/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/br/firefox-125.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b25b61c70f33da99c37a8a60758f8e2e1c6ff198cde50918affd3c3349d81425"; + sha256 = "1e19bd29b6361aafdaf09fe6a9299434db0b240a68f3ad934cde2c8c4c03c790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/bs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bs/firefox-125.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "a45cbc87242e1051656c3af9d1242d09025b8e26898241c28761b22b1c51f039"; + sha256 = "7432eed3e1a2c8480d7610e209f7b55ab8c9084dfcae453adfba40e0d43a6fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ca-valencia/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ca-valencia/firefox-125.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "51a48507a3ad56086c63a10f8c75e08a261fc40941c71601707a331b846f7194"; + sha256 = "68fa72fa1145aeba1c40b8d1971f985814161ae63a502f68183dea627b36e3bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ca/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ca/firefox-125.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "955b37144830f72c1eec4f8bb715645ea74fbda15433f792c8663ab9188d14f7"; + sha256 = "9f57ea19e727b409aee9783cdf0992918d9b586c87e59ba2d88b7b4cb8de182f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/cak/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cak/firefox-125.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9a4a0f6a5b7d9271368546d6089aa748d939a45a302254cda977184a3b6c61bf"; + sha256 = "a35a688ab4192a3b14c08c2a0ba70a36a98c9228ac74b8782be835761c84a930"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/cs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cs/firefox-125.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "6867f54cbea281663237c64ef1500193fc11af9aff293a91bedb18ad86ee3466"; + sha256 = "b52f8d472fbdc98c571e1915da8ece00f6b66b2d4f2fb3cfc9a0a87f96ec32fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/cy/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cy/firefox-125.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "02f3fa299eb4ff4150bb8faca6af3471f55748a5511d0ebcfade5d0710660a40"; + sha256 = "6f10274a2ecd6358eba51cd9ca0d2548a30c1a9af074c92e00c8702385f2e2db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/da/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/da/firefox-125.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b3aa5f61461632ccf4601c92e8591bb6ada99b7c90f51de1330be12ca3793731"; + sha256 = "6ffc7d1e7ba3549fd68eb225a870b84807cf4c8277490a9ff5efa8118b629daf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/de/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/de/firefox-125.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b547a95a680656f17d86ceb24e600c7c4100d0760b033725982964e170993e78"; + sha256 = "2530ca9be98f115521c34f6dbf2c7d8cf1e4b4a65ce087f702f390fd091ea27e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/dsb/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/dsb/firefox-125.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e45262e9c43cec4febf4e3980e26fe05fd31f2c7c177f80debb40df460fd32d7"; + sha256 = "1f6d8d87a4c0504fe2c076eaba0683dfd145df33101dd66bf422dcc1b08ec600"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/el/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/el/firefox-125.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "9663c2e2239ea1fd5d9418d81c9dc34378b763c9b34e3021b7af8e6b2b37ab9b"; + sha256 = "8d428453a25947a39236766e8896c84e264e5e0e79636eca5ad66de24dc4dacd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/en-CA/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-CA/firefox-125.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "01f33a3769fc2a7f86ad69e44bb259e99d34baf073464c5599a5f9eeac97560f"; + sha256 = "518d40beac437ef3974884572b504ecef611927f471bbd2673bac3ae79b524f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/en-GB/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-GB/firefox-125.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c47be8a66974fff29aa1931cd375428582cef36f162c9d4ff9385bcbf9caa881"; + sha256 = "2f306743cb4d570058cd25adb6cc674ec21b98459a4127523d4748c694428481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/en-US/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-US/firefox-125.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "74edf52f4ad30da7a051bf4c8500cbc30124ffe87a964c4c875a3868953de6d0"; + sha256 = "08ccf11fbd664b80f2f5f71da98e486b1bfed34e1fc5f85027810b0cdbde8962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/eo/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/eo/firefox-125.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8fc92ad949104d6d70baf2efe5619feaf592142c31c056532d08769c689187ac"; + sha256 = "6f3c5a5c92e19c8ee9371296604d354d1725ee52546d5d627c7b0039b72c77ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/es-AR/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-AR/firefox-125.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f4e42db7d5c4805d18c4c29aacee7cce8f4c1635e09afd36ee9521f263067a15"; + sha256 = "e75e034b2e797eed918474f0ec6aad44a4b562f367ac4d3ae953676b4c58d1ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/es-CL/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-CL/firefox-125.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e5e80a3390de83d29169e6dd07c62d8705bcab07c9e6d3cf9c6463ce74e5fc33"; + sha256 = "113e48f98b738dccca3f11ef7eeccbe740c3a6019d91c8cb0505f3c2faf6682c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/es-ES/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-ES/firefox-125.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "63425fb300558de58634fa1f8dd61c786e8c589f51e0d86578924b29e1e22b65"; + sha256 = "a8beea1049c77a48b098fe8fe2121d0b0eb83edb471b53733dd1183effdc0bcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/es-MX/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-MX/firefox-125.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "082ecba35c666ecad7d3b52f45b2703cbe115340c7afada80452515a86db5fd1"; + sha256 = "796759fd53e134559142d88d2a0d242feca6120660345468665f0a9b08e49999"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/et/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/et/firefox-125.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ae7bc9f702d45b5d930f1a35d2abf1ed32eb7ecb3b02a60af59f5b7fb13f319a"; + sha256 = "3bea5fc06a710e69c23998f729463c767200bd0e0528d4ed89dadb55f20ab53d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/eu/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/eu/firefox-125.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "98a44f41fde7e10ef85081f89ed4090c9f63fe5aa3bbd3aa28af3c513723a2d0"; + sha256 = "57e0087f574ab13a3aac00c732dfaaf5aa768fba8a56d086c56e19dcdc24de33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/fa/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fa/firefox-125.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "af4116d90a3e0598c865d1afbfbe60b72a4a853c3749efdf8a361b7341d9de3c"; + sha256 = "af7cad609b5a4b155b19c227c8664f6b9136655c804b44e7fa3c9100fe371baa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ff/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ff/firefox-125.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ec11b54a73b3d7b7852ecd55f754f6fce8702ed6f13da36da1decff764b3c31e"; + sha256 = "3148f266c40bc08bdac8fe3ea0f458c4a01b1bca60f5c2101d00901e0de4775d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/fi/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fi/firefox-125.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "1282a3d3729b784d63be14de93b2242be956cbdecb90a820657fe4b347581d0d"; + sha256 = "423be151b922259c88d36c92e54a60dea2f6328bfd086d32dc74cd1a6d0eedd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/fr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fr/firefox-125.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0098cb08348072907eb495a52bec66ab957e1240ded6e1308d214a3fca42657a"; + sha256 = "946fa92a4e746e6755a6af0ca404135b8ba0388f57c8abb1f69963f3cf606811"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/fur/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fur/firefox-125.0.2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "f79f3155f219915d5afc40c62dfe87221a0d2799a4406a30ffe87ed2d42fbd79"; + sha256 = "931b5d7bfc87228770624e7ce6c437337fec17e54d4f3dfd03bead3692844d43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/fy-NL/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fy-NL/firefox-125.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3c24ce3a55c59ab3f95b0675e642d7f5586203e80d95e463bef497289ee5319e"; + sha256 = "8c0745e61f0465ce452a13ec02c13bf1fdf497e2abc66d357b3c5aaf5a8b9ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ga-IE/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ga-IE/firefox-125.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "9fe07349a3aa1d81fd6d7e35d13e836dc40d5aa4b007590b2605854674aa3952"; + sha256 = "b2c1b6dd41a56fab2f7aaf049ed4afa4af80d1458ca3b3a56f630a9f39174edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/gd/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gd/firefox-125.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "08f64329cb6741f5d98e9b3078bfe39176a6916fb3e5e9fdea5a960fd742c45e"; + sha256 = "8701d32ecd572560bf26609857a0d7af6b5946774bbb820e49a54c55e175bc83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/gl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gl/firefox-125.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a95ecc82a8ec82d8ef1ecc0017d77629029d3452d8b8f318006369a5cb80982b"; + sha256 = "a85edef215b2f9beaba5b3c396cfc248157dd7819eedde7fa420b8cd306ba816"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/gn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gn/firefox-125.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "730ed9e1a405eceab7710c56e733415dd8d46835730f73d200967eaa8068bc38"; + sha256 = "49a3b8909d29f5609a1da6477a43f719fe20ac178ac7d69299f8f21126f7f739"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/gu-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gu-IN/firefox-125.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8492916bb3e42146b03d85d8b508d114a2d66f0e3dad530db5e1aa4fcb46e6ad"; + sha256 = "44ea127c78193c5dc83f5bf8e5f2adca93d91e2ccc0266ca68b9d17c8f8cbc74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/he/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/he/firefox-125.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "58df2522670a372bbf6738c4ab3f2a519cd1c130013cde026f824baeaa22da84"; + sha256 = "2df30f0cdeed80e2d2dc1113db666b7340893fa52337d913ac6255e9823a6a2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/hi-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hi-IN/firefox-125.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2d4ba12c040e79192b365a54b6aa5bb3291654b365dec20c9c5ad613b45d7ae9"; + sha256 = "051e5df71df66353f8fe940efcffb8ec9b1586057d9118685387b713dea255d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/hr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hr/firefox-125.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "491c58851053bdc12272a51d53ffa99c9e364987043330123bb6bfce59b5c54a"; + sha256 = "0525bb2435c8e829534886e405f4e5802641a6659ad5276980d1bf5378903436"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/hsb/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hsb/firefox-125.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "107d28edfe981e72b251389b42237f8e28354f80322a67834f4cc6f61c7b3bc0"; + sha256 = "902793e7d135940797a44a4285cbae3f1b3a579740f386b1de463065d566d603"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/hu/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hu/firefox-125.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "40e2d17893ccaac04d59927c132df9ad660709a176b63ff809cecf46d13c354e"; + sha256 = "127db71d94fd41770ffc4715d16fa2e7e9f9aed77db8ff21c566e74a3fa67931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/hy-AM/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hy-AM/firefox-125.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0854cb95ff8e5477ce90269a86d4b874726ab8514a3180f8ee65d9f6b5d8d2fc"; + sha256 = "6479e62315e8402655a06f6e58765c8d8b71a1635af582f32e75a06d98603ebd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ia/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ia/firefox-125.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a2e05f7c183298aaa8e5c8793016a3ff08b8e4a52329609e9cf2a95637c19ad6"; + sha256 = "5cb8656e668d2efc8c35228640a99696afd72f23d1a3702da25b3a5e8fe9d1ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/id/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/id/firefox-125.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "39b4e7bab67eadc92c539c9ac3fed3734f9c40116ee10cbaeb14ce3e75b513c1"; + sha256 = "acf5464fe544b9b72ac650830bb4337acc851f037f9937e0d2932e2056fe06f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/is/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/is/firefox-125.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "6c1462e0400781dcd6b3f76c8a99448d20e730d55c4f85cbc76dd1f603a271ab"; + sha256 = "28475ce33fbf59db4cb84775a2a7c39b641b3bea67dd1e7e49d5ace1878f306a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/it/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/it/firefox-125.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f7b7243d6e673119ca94454ce021fa62c6be362dac0a8bf82522f078b5791fa5"; + sha256 = "0b79a518da5b28aa74d22d3df117310c39521114b0e627d3d42bd694e06e6d90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ja/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ja/firefox-125.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "cd0d6afefb93c54f6071e5f2531d55e2aa6a9c11d75db602d6786cf2a7e8107c"; + sha256 = "e99dee56181843e5c1b1af336f1fb68c2c2eb7eeebed885c067bb57a5a62d56d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ka/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ka/firefox-125.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5adb7257094092e750d0928010960b95d10e4314e751fe24ea538f346e536448"; + sha256 = "a4657d7a0f8e2c445837cb42171780fa221ea528eddb7d17d23ba3afbd7592c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/kab/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kab/firefox-125.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "12be3d00879ec8cf005334ec02858b1f002d6a791a16ad15877e67129685ac97"; + sha256 = "b36b00e250f6b1f1abbd816f7e0038f711b75e5a017bee285c3fa2995ac1ebc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/kk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kk/firefox-125.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dbef81680cb250bfb88e0ad415109084cc41e37ea2e5aa5f33603e9b8b5d9852"; + sha256 = "f66c2b7364f0b2742efe8e532dca7884b72a2811b72e3b0de0d8260ae007ec92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/km/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/km/firefox-125.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "7fb2b698eba1955615652abdb1d7e4690a831b4d2ff6d83177d058326a6f467f"; + sha256 = "d137d33268cb376423d4395be1193af2bb73bee0e0b7726abe7e70d7b6d96ed5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/kn/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kn/firefox-125.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "233e2808909647bb88263fbe5a5059f9f52ef9a75643593ec1ec08e4f3882e04"; + sha256 = "ac3aff36240512506a51543a9766bd85a796a2fb137666207fe221a0e17152e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ko/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ko/firefox-125.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9548b4957a85d06fa53d8bc8c81218ca2b69ad6319b19347ad99632f9956d003"; + sha256 = "2af68d3e380de18efc36937193dfaadd8c438be39b45a297edf3fd9c73fff7be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/lij/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lij/firefox-125.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a4e868da0b0a70896a89f27a168f61fff1ff4b3e855fb7965c2e026f70c3d4f4"; + sha256 = "5c708d6c2c1b55b90c0728c7567132c61b6ceb64ed0c7be71c26218653e143bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/lt/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lt/firefox-125.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "118bfe552e7bfe491116d298da7db1f32cac567492d91266027bc51507dd7a49"; + sha256 = "7f2e33013772b3bf042415c45c1d75d407fe007167f628dcd14aaecc6855f088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/lv/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lv/firefox-125.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "c61321d70514f60b3398a74173859af0f52eab45092249337df7d98dec3e4276"; + sha256 = "1a736f61f8ca876ea12221fb23c54d3166f9c4d0edbe90839300ed1fef7d4c92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/mk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/mk/firefox-125.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "fa52e7ceb32da4ce05eb976d86cd4560bb3edd657759b1f23d730b3c98342ed3"; + sha256 = "c688a25f9113b2c688da4f4e9290f30a1fd2d2a23b54dadefb219f5d95d30bc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/mr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/mr/firefox-125.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "48461d450e1b6479bc97ec299826aa654d3e2729d1c30f8a0185a7e716b174f9"; + sha256 = "b46aabecf664d093a1928f6004d21dc81b2ffc195926652f6af276661900abd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ms/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ms/firefox-125.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "094d2e141b64166def7057f1e52771a1746da901ada033a85eaeb400dcecd87e"; + sha256 = "22efdbdc9ea35b8d9fe3f26f08a971361c4931abec59758f077a6d12e6f6f4fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/my/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/my/firefox-125.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "5ba746cf4ae0144bcd23b8fbcc11d99024c986fd77c184e65b11718c13651ae3"; + sha256 = "c4577d22565386ce731612103ee797d8a01df494cab95442d412cb2163a012ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/nb-NO/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nb-NO/firefox-125.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0dc2ce3693094d74fbf3886829e6607b231fcbf62c52b0390442a35982dbf576"; + sha256 = "dfe7b1164522e0d16444efec1f59269fef971d0362cbfe9f612f7fa5cad7c88f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ne-NP/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ne-NP/firefox-125.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "50339dec36a6dc1373a062b5efc949260794ea91a314dcd231b0bb55865e0360"; + sha256 = "6686fdc0c953696a0d33dd52d30ade52bd8c9eb3f0ece2c2c0c05aacba0e5e6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/nl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nl/firefox-125.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "233213f825dec576a9ba2a64fd7085702ccbe58c4b8559320df9b75d5687dc55"; + sha256 = "122d6f234ae9b8459117e64658ca322e98d19a2c52df92d6152baf9b36aea82a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/nn-NO/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nn-NO/firefox-125.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7a44a510a34c08878dc890d58e68e9fa8443f78c744d3418e3e71246bed59ce4"; + sha256 = "d1db5f3b8433275b521e3f51afdd62180ae255446f199bd5a474a59a30fa432c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/oc/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/oc/firefox-125.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "7dde113e65b348273534a74599a18ca930e77a39b17cdd6a44868342047105e6"; + sha256 = "9175fb84d455f5f3b31d3dc646451644c12df19f930420e7e408e89ed86e595c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/pa-IN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pa-IN/firefox-125.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c25cb703f2271e941c71efb204769542361bf3b142416ad4a9da6f492a7b5bf3"; + sha256 = "bdf66cc8ecd0f924f0dafba2e242f696fe9be86a7e69d67d44aba4e4868da951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/pl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pl/firefox-125.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "20b5186352f30a095ba3d95812f604b94115be81d1f4dc17fd52f2398a283c36"; + sha256 = "3595e0cc555c55f28f5bec95959517ac6687421319aeb549c15bf50faa38b43d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/pt-BR/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pt-BR/firefox-125.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "38faacb1a09b4cccc916f0b02dfc6fd6e8c7192abb7ae9b1e591a7a8997204b0"; + sha256 = "bf5ea226f5bf1c4113ef0d6885a1b74af83f38591972ee4d2c6d1063869a934d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/pt-PT/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pt-PT/firefox-125.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "510793509d58dfbbee73d175b9ccea23c510b1ba89258abd15f5a458991629b2"; + sha256 = "54e2d124625715c63c224b8914f53a1e06052ad7bd9c06acaaaa0b61a996f018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/rm/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/rm/firefox-125.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1a5ca58dfdf0106993d5e2d867f19d97004f40addb11c2d8ef54d6d9aad3498e"; + sha256 = "24371d9664b00363d02e3881b89e86732f53e9bd989b5fca2a2a70c9d998b836"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ro/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ro/firefox-125.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d78d2724e02ee0143d3a99447c57cf0247aa0afbe90e71dcbe18aec99819e453"; + sha256 = "7a47f911a297375cd3bcf407f876c56c6cb88ca5020d218cf4077c780c1732e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ru/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ru/firefox-125.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "84f67030ba790f61683dbb4ca213306b6e011e7475e8ac7ea83c1590282fcc37"; + sha256 = "fc5ad6b89224b862b586692bf3536205786c90230c595cda8e8b37c64839aa27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sat/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sat/firefox-125.0.2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "206cd5f0a4d54d351072ed26e7456fb8939d966e5fc4f3bfa7d6db2d702a4f21"; + sha256 = "bbfd0aaee2266aae2a0b30f2b35770eb2fb51e46dba75d737aadbb31da243d39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sc/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sc/firefox-125.0.2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "f69dddd1ffb0ffe584f540080e87891bcb777b559ccd608d1a988b95d2987e22"; + sha256 = "c09414e2609fbbe64157c2ed19a8f4b079a35847a4b418d84451a813b5b8dd63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sco/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sco/firefox-125.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d03c22f141b7d156c469a094ed42eb5036a61e9dc95104d436efa4c04ebba2e6"; + sha256 = "c2a8ba393c85956e7e9b4f778b7a6d15bb6ccfd3784e3e0f25d8ab0cbea53dec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/si/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/si/firefox-125.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a991097a60651f19d6cd09e0f3d8ba7a0183436809acc5ade7d67284ccc613c0"; + sha256 = "431670b3f074ad1cfb91033cd115b7d7dc0145a138fa7ec258afa8ea9de8759a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sk/firefox-125.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d8ce6cbcc25b25fb45bdcb04f2943679312fa2e35b6d468abb0d82cf96c232c8"; + sha256 = "0022b74c8688325113aff06ddcad2a008195c093a86b26c0344a6c5377a990f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sl/firefox-125.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "517cdb4c0a5ddbcb561fabe363e554b1185f3cf81ce7c1184e1ba6b8132ed581"; + sha256 = "ee6eb7ece377119e362c2ffc85ea6ac9f7a03ded3ae44b148f73e708600ccf40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/son/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/son/firefox-125.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5fdababef3eac95ba8b37c31fce0a0ae9af4b3c5c120bfe11675542c49a258b2"; + sha256 = "17075b61d96ce5bf6e9d5131c00c4cee84a3bf97e81a0672ca292c8c24318006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sq/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sq/firefox-125.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "afca2302d567825f5491ca30b26a574aa619d28a7f5b57c4cd3bcc226c303e12"; + sha256 = "758b50ad050464f67afe3615826b2e8c36ef852f911abb3f85dba198b452e9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sr/firefox-125.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "f654f14ce5a755b11dd5469f0933369e3eead229b80b5cdb589b62778c61740b"; + sha256 = "b63320cdac54d79d9c192df4732f63795718bd72a8d69a7b08d03a444d913d44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/sv-SE/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sv-SE/firefox-125.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "6be108ab142eacfba437d095b5ef2ae33299f807e3b559383fd1175f7a7dd5b9"; + sha256 = "bfc3854d763a26231884c31e938ab699fc267eaada2fba59825ae4978addb6ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/szl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/szl/firefox-125.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "e755972dd5c0cab85b35866292a5b05b959ddff5067d2eda6de7d9e7860ac01c"; + sha256 = "59142a86da4d79a9045e3402f5dc08ad1bb4fd0da19c38678e23ec28fe0d17e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ta/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ta/firefox-125.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "487cd185dc4d962f7bcf5f81f6e3e0b484362045c011dbe071bc9010fe875180"; + sha256 = "10f81b53ab382c3d886cccdcbc358d88913047c2d3b46f3b5ede8e6e37e49f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/te/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/te/firefox-125.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "3b95a354f5eb085127be28b449e25f1325b729ecadee6b7aff1f3566e63f93c0"; + sha256 = "cfc670b083d0833f12009fb7a5900005b587f8810703fe1524eff4a8d7324924"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/tg/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tg/firefox-125.0.2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "54ceeb56dec6488cfef1dbb4d935ec34a125cf845b0be75d36892a355859d7c1"; + sha256 = "85639be530c9646f3585da1e016baaa5da94ea5f013fb000e9701f24ef0f1a6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/th/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/th/firefox-125.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6f6cd95e698443ba2cc93f055bbe8bbd05917ba01f1dd1319efa651ef7e5fc6b"; + sha256 = "fad792259e305d54f79a96cb7531a1715e005550a38f1270c8c7c87bfafde1f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/tl/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tl/firefox-125.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d888fa3dbf892dcff43217aacddc702837d47997ffcd98c5132c368cd81abe7a"; + sha256 = "3e99c9479f4b3cf56b50c42b8795a6b33fbbc691fa590a37154e7cce060e4a86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/tr/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tr/firefox-125.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5465d58f850279aff0c180cf0a5ae492bc5927fe19f8129d333bcbd2d3d0e528"; + sha256 = "ed87d470ba9002b8dad1602903a7e09ffbfc060f07a18c0add678b598734c375"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/trs/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/trs/firefox-125.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ab5be47b0fec39246f209bdca5224bc0ef4198e4ef187be1fdd3004dd661b5f5"; + sha256 = "06828e917ef4af7d21e9f029089786c83e8fd68566791fe7e4c3864e86c3e6f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/uk/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/uk/firefox-125.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "055e616c9eb6236ee73da70e8f54ffe9ee30e5383d2bb0860dbbe7054c286b6f"; + sha256 = "b25acede364fe39902fa28246598f98f84a7dc3165360aa9c64cf1561fa15ef6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/ur/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ur/firefox-125.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e69f674cfe3194a9fa64b9cd8b798a936eda27385caaa1e514cda6f9613ac415"; + sha256 = "a4cea15d11709f4d6dcbded2dc4148a0fb898714ccc25a04cbcbbcd95ee71cc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/uz/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/uz/firefox-125.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "627f344f5ba7f570e12660ac176e55e7e4d3e7e1fa5b1b2861ca925a57d00fb4"; + sha256 = "0391b07c6610249fdb6b9d97f7740be9eef58e17839226aec92824288c470f27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/vi/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/vi/firefox-125.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e6fd12988a887b091160f96bb4c18fbf35ebe34f5209d6e0520b4f8636829e0b"; + sha256 = "a5ae2a1f2742cccddee2b5f38410420c70819bc50690036f70751cd167652148"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/xh/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/xh/firefox-125.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "c9249d34812650856f7b160b9c0c39ff219bc5f98fa4d6cfb8020f795676cc27"; + sha256 = "ecfb3185448cb3f41dc1cf0ac21cdb44bfb01c26a84630376090749c8148af5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/zh-CN/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/zh-CN/firefox-125.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "dbab47a09188494057e5c8f2dc1637367ea8bb5226a32817c3e3e458a3eceb9b"; + sha256 = "4b4fdcf285ac82083c4b1ca18d91884bceaf9fdbf407266a6aade2ecf7f3c6ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/124.0/linux-i686/zh-TW/firefox-124.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/zh-TW/firefox-125.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "04650543d51061cc169d47c949cd958675bc97824e0993a367d7a7bab1d3d3d9"; + sha256 = "8f3be757fb5212e849a31a98f7b1ec874a19d14e8d9af186d36c070759005e23"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 45823df01d99c..5166fdf85153a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -121,7 +121,7 @@ in , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport , mlsAPISupport ? geolocationSupport -, webrtcSupport ? !privacySupport && !stdenv.hostPlatform.isRiscV +, webrtcSupport ? !privacySupport # digital rights managemewnt @@ -183,7 +183,7 @@ let # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. wasiSysRoot = runCommand "wasi-sysroot" {} '' mkdir -p $out/lib/wasm32-wasi - for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/*; do ln -s $lib $out/lib/wasm32-wasi done ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 900eb94756b27..bf342444c99b3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "124.0"; + version = "125.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "028c1a447bc2e608e1ba06cc66b1a33e0a4179744f0e8406d6f2b7317bf99fdd84eb97de0e96d4adcef9f2498b083bac38ccbf2d55e213a4a7e8ff6d94974cfc"; + sha512 = "f6d5fff7c5c532d2e41a246d0403bdd746981cfcb7c43f9d3d8ec85a7acc3310a52043d1e18848475cef1b63c24769e81b2b06d68ae007b68016ee51436032f1"; }; extraPatches = [ @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "124.0b9"; + version = "125.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1da2f0384719334bdef36293fe175850874dad3ee2e4edc97d7328e7967d19ebc7b241148d34d5e6108663dfb8282c3ed5bfbea734b797ce94c0c215d2e23051"; + sha512 = "66d1b27355c105714b926b5424badc01582e5ad7e979104d05fa50748ea961c7f1e081b88978fb94aee54ed281931b8d0f0bb0e16670cf89e7f10703711e7f4e"; }; meta = { @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "124.0b9"; + version = "125.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "74460dcb68b895203752266f83243ca90328f5bad4745e9b435cfa403f0f7e5e8a367cad6c31dd970a51b008b0b88188790f64a943c1e6eecd9c6799d992c3d0"; + sha512 = "a000d1ad29a6a83af6bb424d9b5099667b93907041ebcf8f18b22a2045f4d0f0292db3b331c33b30d142ee6feb58386cedcae356c79d2c5e31fc7a571af2b63c"; }; meta = { @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.9.0esr"; + version = "115.10.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2828931e79f6f2476a699afdac02133f2f04d478c5a8ed288339701387d57354f73df50d1d2a08e6afdddc9a2b95b1820c9ca1bfdce3e0772cb0ba71e12aab88"; + sha512 = "0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index a2b97577c8d3f..15c8ffc3b22d6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -18,6 +18,7 @@ , sndio , libjack2 , speechd +, removeReferencesTo }: ## configurability of the wrapper itself @@ -66,7 +67,7 @@ let deprecatedNativeMessagingHost = option: pkg: if (cfg.${option} or false) then - lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts.packages` instead" + lib.warn "The cfg.${option} argument for `firefox.override` is deprecated, please add `pkgs.${pkg.pname}` to `nativeMessagingHosts` instead" [pkg] else []; @@ -238,7 +239,7 @@ let }; })); - nativeBuildInputs = [ makeWrapper lndir jq ]; + nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ]; buildInputs = [ browser.gtk3 ]; @@ -413,7 +414,9 @@ let passthru = { unwrapped = browser; }; disallowedRequisites = [ stdenv.cc ]; - + postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; meta = browser.meta // { inherit (browser.meta) description; mainProgram = launcherName; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 6bb01b63e5cda..0bf2fd36c0fbe 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.10.5"; + packageVersion = "11.12.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.8.0"; + version = "115.10.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-uKgN74xn0v86E/YfqbJNnMIR3gS+3dhdgLJ5VUerurQ="; + hash = "sha256-9mJW8VFYClQ3D8/nPtlCVaVULvEICS+RQhz1dLujn6Q="; }; extraConfigureFlags = [ @@ -31,6 +31,8 @@ "--with-unsigned-addon-scopes=app,system" ]; + updateScript = ./update.sh; + meta = { description = "A fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; homepage = "https://floorp.app/"; diff --git a/pkgs/applications/networking/browsers/floorp/update.sh b/pkgs/applications/networking/browsers/floorp/update.sh new file mode 100755 index 0000000000000..4f367f29e7762 --- /dev/null +++ b/pkgs/applications/networking/browsers/floorp/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl nix-prefetch-github jq gnused + +set -e + +owner=Floorp-Projects +repo=Floorp +dirname="$(dirname "$0")" + +updateVersion() { + sed -i "s/packageVersion = \"[0-9.]*\";/packageVersion = \"$1\";/g" "$dirname/default.nix" +} + +updateBaseVersion() { + local base + base=$(curl -s "https://raw.githubusercontent.com/$owner/$repo/v$1/browser/config/version.txt") + sed -i "s/version = \"[0-9.]*\";/version = \"$base\";/g" "$dirname/default.nix" +} + +updateHash() { + local hash + hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash) + sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix" +} + +currentVersion=$(cd "$dirname" && nix eval --raw -f ../../../../.. floorp.version) + +latestTag=$(curl -s https://api.github.com/repos/Floorp-Projects/Floorp/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Floorp is up-to-date: ${currentVersion}" + exit 0 +fi + +updateVersion "$latestVersion" +updateBaseVersion "$latestVersion" +updateHash "$latestVersion" diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index c29400c32fdf1..fc81be7124416 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -1,73 +1,157 @@ { lib , stdenv , fetchFromGitHub +, fetchzip +, fetchurl +, cacert +, tzdata +, unicode-emoji +, unicode-character-database +, darwin , cmake , ninja -, unzip -, wrapQtAppsHook , libxcrypt -, qtbase +, qt6Packages , nixosTests +, AppKit +, Cocoa +, Foundation +, OpenGL }: +let + inherit (builtins) elemAt; + cldr_version = "44.1.0"; + cldr-json = fetchzip { + url = "https://github.com/unicode-org/cldr-json/releases/download/${cldr_version}/cldr-${cldr_version}-json-modern.zip"; + stripRoot = false; + hash = "sha256-EbbzaaspKgRT/dsJV3Kf0Dfj8LN9zT+Pl4gk5kiOXWk="; + postFetch = '' + echo -n ${cldr_version} > $out/version.txt + ''; + }; + unicode-idna = fetchurl { + url = "https://www.unicode.org/Public/idna/${unicode-character-database.version}/IdnaMappingTable.txt"; + hash = "sha256-QCy9KF8flS/NCDS2NUHVT2nT2PG4+Fmb9xoaFJNfgsQ="; + }; + adobe-icc-profiles = fetchurl { + url = "https://download.adobe.com/pub/adobe/iccprofiles/win/AdobeICCProfilesCS4Win_end-user.zip"; + hash = "sha256-kgQ7fDyloloPaXXQzcV9tgpn3Lnr37FbFiZzEb61j5Q="; + name = "adobe-icc-profiles.zip"; + }; + public_suffix_commit = "9094af5c6cb260e69137c043c01be18fee01a540"; + public-suffix-list = fetchurl { + url = "https://raw.githubusercontent.com/publicsuffix/list/${public_suffix_commit}/public_suffix_list.dat"; + hash = "sha256-0szHUz1T0MXOQ9tcXoKY2F/bI3s7hsYCjURqywZsf1w="; + }; + # Note: The cacert version is synthetic and must match the version in the package's CMake + cacert_version = "2023-12-12"; +in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "unstable-2023-01-17"; + version = "0-unstable-2024-03-16"; src = fetchFromGitHub { owner = "SerenityOS"; repo = "serenity"; - rev = "45e85d20b64862df119f643f24e2d500c76c58f3"; - hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; + rev = "3a8bde9ef24dace600484b38992fdc7d17bf92c3"; + hash = "sha256-r8HYcexrOjDYsXuCtROiNY7Rl60pVQBvVQf190gqNuY="; }; sourceRoot = "${finalAttrs.src.name}/Ladybird"; postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "MACOSX_BUNDLE TRUE" "MACOSX_BUNDLE FALSE" - # https://github.com/SerenityOS/serenity/issues/17062 - substituteInPlace main.cpp \ - --replace "./SQLServer/SQLServer" "$out/bin/SQLServer" - # https://github.com/SerenityOS/serenity/issues/10055 - substituteInPlace ../Meta/Lagom/CMakeLists.txt \ - --replace "@rpath" "$out/lib" + sed -i '/iconutil/d' CMakeLists.txt + + # Don't set absolute paths in RPATH + substituteInPlace ../Meta/CMake/lagom_install_options.cmake \ + --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib" ''; - nativeBuildInputs = [ + preConfigure = '' + # Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx + # Note that the versions of the input data packages must match the + # expected version in the package's CMake. + mkdir -p build/Caches + + ln -s ${cldr-json} build/Caches/CLDR + + cp -r ${unicode-character-database}/share/unicode build/Caches/UCD + chmod +w build/Caches/UCD + cp ${unicode-emoji}/share/unicode/emoji/emoji-test.txt build/Caches/UCD + cp ${unicode-idna} build/Caches/UCD/IdnaMappingTable.txt + echo -n ${unicode-character-database.version} > build/Caches/UCD/version.txt + chmod -w build/Caches/UCD + + mkdir build/Caches/TZDB + tar -xzf ${elemAt tzdata.srcs 0} -C build/Caches/TZDB + echo -n ${tzdata.version} > build/Caches/TZDB/version.txt + + mkdir build/Caches/CACERT + cp ${cacert}/etc/ssl/certs/ca-bundle.crt build/Caches/CACERT/cacert-${cacert_version}.pem + echo -n ${cacert_version} > build/Caches/CACERT/version.txt + + mkdir build/Caches/PublicSuffix + cp ${public-suffix-list} build/Caches/PublicSuffix/public_suffix_list.dat + + mkdir build/Caches/AdobeICCProfiles + cp ${adobe-icc-profiles} build/Caches/AdobeICCProfiles/adobe-icc-profiles.zip + chmod +w build/Caches/AdobeICCProfiles + ''; + + nativeBuildInputs = with qt6Packages; [ cmake ninja - unzip wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with qt6Packages; [ libxcrypt qtbase + qtmultimedia + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + Foundation + OpenGL ]; cmakeFlags = [ # Disable network operations - "-DENABLE_TIME_ZONE_DATABASE_DOWNLOAD=false" - "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" + "-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 + # FIXME: Add an option to enable PulseAudio rather than using Qt multimedia on non-macOS + env.NIX_CFLAGS_COMPILE = "-Wno-error"; - # https://github.com/SerenityOS/serenity/issues/10055 postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath $out/lib $out/bin/ladybird + mkdir -p $out/Applications $out/bin + mv $out/bundle/Ladybird.app $out/Applications ''; + # Only Ladybird and WebContent need wrapped, if Qt is enabled. + # On linux we end up wraping some non-Qt apps, like headless-browser. + dontWrapQtApps = stdenv.isDarwin; + passthru.tests = { nixosTest = nixosTests.ladybird; }; meta = with lib; { - description = "A browser using the SerenityOS LibWeb engine with a Qt GUI"; - homepage = "https://github.com/awesomekling/ladybird"; + description = "A browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI"; + homepage = "https://ladybird.dev"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "Ladybird"; }; }) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 0f829613200b7..593f70afe4218 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "123.0.1-1", + "packageVersion": "125.0.1-1", "source": { - "rev": "123.0.1-1", - "sha256": "1rw10n0na7v2syf0dqmjl91d6jhnhzb6xbcd13frwclp1v5j0irk" + "rev": "125.0.1-1", + "sha256": "1h2x08gdpw3bldmfkws5qafp73r4w11a7ad3xc6flyg96b8a6h4f" }, "settings": { - "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", - "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" + "rev": "6b2b6a89fc15a705388955e4d1375f453d8cdc89", + "sha256": "0yginhc8pn00k1gh8h7bzvrl4vi2wimbmrrgnmvvblv28bxhwnh0" }, "firefox": { - "version": "123.0.1", - "sha512": "e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2" + "version": "125.0.1", + "sha512": "6f2f336de8b0ec9cb19ba20c909407b7b88c0319ee3b2f1f3429133516b0c45b4c7846f287985a0cdb9f34acc7d5378ed14fb48e26bef113c8ac360501a30c4d" } } diff --git a/pkgs/applications/networking/browsers/litebrowser/default.nix b/pkgs/applications/networking/browsers/litebrowser/default.nix index d1ffce7e6e5eb..0c2c2b2e9b3c2 100644 --- a/pkgs/applications/networking/browsers/litebrowser/default.nix +++ b/pkgs/applications/networking/browsers/litebrowser/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "litebrowser"; - version = "unstable-2022-10-31"; + version = "unstable-2024-02-25"; src = fetchFromGitHub { owner = "litehtml"; repo = "litebrowser-linux"; - rev = "4654f8fb2d5e2deba7ac6223b6639341bd3b7eba"; - hash = "sha256-SvW1AOxLBLKqa+/2u2Zn+/t33ZzQHmqlcLRl6z0rK9U="; + rev = "8130cf50af90e07d201d43b934b5a57f7ed4e68d"; + hash = "sha256-L/pd4VypDfjLKfh+HLpc4um+POWGzGa4OOttudwJxyk="; fetchSubmodules = true; # litehtml submodule }; @@ -46,6 +46,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = stdenv.cc.isClang; # https://github.com/litehtml/litebrowser-linux/issues/19 description = "A simple browser based on the litehtml engine"; mainProgram = "litebrowser"; homepage = "https://github.com/litehtml/litebrowser-linux"; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index a737685190863..a142ced14bdfb 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -22,6 +22,7 @@ , expat , libdrm , libxkbcommon +, pipewire , gtk3 , pango , cairo @@ -32,6 +33,7 @@ , libuuid , systemd , wayland +, libGL # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -81,7 +83,7 @@ stdenv.mkDerivation rec { xorg.libxcb cups.lib dbus.lib expat libdrm xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXrandr libxkbcommon - gtk3 pango cairo gdk-pixbuf mesa + pipewire gtk3 pango cairo gdk-pixbuf mesa alsa-lib at-spi2-core xorg.libxshmfence systemd wayland ]; naclHelper = lib.makeLibraryPath [ @@ -92,7 +94,7 @@ stdenv.mkDerivation rec { glib nss nspr ]; libGLESv2 = lib.makeLibraryPath [ - xorg.libX11 xorg.libXext xorg.libxcb wayland + xorg.libX11 xorg.libXext xorg.libxcb wayland libGL ]; liboneauth = lib.makeLibraryPath [ libuuid xorg.libX11 diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 4271b21fa8fd1..b898cd823b355 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 = "123.0.2420.41"; + version = "124.0.2478.39"; revision = "1"; - hash = "sha256-tWsd+RyGJp+/1Sf4yDrq4EbLfaYsLkm4wLj9rfWmPlE="; + hash = "sha256-0KQU/JS6hlv2SLMB8RKyITUiodByBUstrhcwIefn3Yw="; }; dev = import ./browser.nix { channel = "dev"; - version = "124.0.2450.2"; + version = "125.0.2518.0"; revision = "1"; - hash = "sha256-9PRQnnTYhArwRcTxuCufM7JcAcr6K7jKeFCrOsarCh0="; + hash = "sha256-q4TVpO0SxSSLMv/NtmJIOzClT2WqUss2qfE5vgj4O7E="; }; stable = import ./browser.nix { channel = "stable"; - version = "122.0.2365.92"; + version = "123.0.2420.97"; revision = "1"; - hash = "sha256-6rEVxFS2advEL4O2uczJTsTy31os9r52IGnHXxj3A+g="; + hash = "sha256-q7Pcbi0JQr/wvKIrgueD9f2Z6v1DMoD2bcRJKGqDYjs="; }; } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 9bb6fe7798320..9edb3d882acb3 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.10"; + version = "13.0.14"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "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-+8b3K3XLSPlndR12KNUH0lsPquhTupxQrLBuSEGac7Y="; + hash = "sha256-z7fZtq+jnoAi6G8RNahGtP1LXeOXU/2wYz5ha2ddAeM="; }; }; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e890b35bc635d..94f2a466295f4 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 = "107.0.5045.36"; + version = "109.0.5097.38"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-NSJmPwDZbmZUv7HoTiZJbvJTAS6HENFWX+JjKVC0oPc="; + hash = "sha256-eljVXaHN7gPqpoL3z+Fz/BH6b+1qxSHtFln6NCxl9tc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index bc4235d82795b..5143b1746ca38 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -14,23 +14,15 @@ , libpulseaudio , makeDesktopItem , wrapGAppsHook +, writeScript , testers }: stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.0.0"; + version = "33.0.2"; - src = fetchzip { - urls = [ - "https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - ]; - hash = if withGTK3 then - "sha256-qZX23dsKNg5AOIaBAAmTWT6VDEl3OGz3kb3idtvJElw=" - else - "sha256-Lz1+5I8Rj0GrBUBTJoRsatpyzkqVHZuWbKARkuWFs5U="; - }; + src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; preferLocalBuild = true; @@ -155,8 +147,49 @@ stdenv.mkDerivation (finalAttrs: { wrapGApp $out/lib/palemoon/palemoon ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + passthru = { + sources = let + urlRegionVariants = buildVariant: map + (region: "https://rm-${region}.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-${buildVariant}.tar.xz") + [ + "eu" + "us" + ]; + in { + gtk3 = fetchzip { + urls = urlRegionVariants "gtk3"; + hash = "sha256-Kahnwlj9PIWB24lvH6h9cZK459NW2Vo2g6ckuv0Ax48="; + }; + gtk2 = fetchzip { + urls = urlRegionVariants "gtk2"; + hash = "sha256-XOiLGmU8O96clUpnp/OkzXmWR1PJ2AdzbVFj6adbcvY="; + }; + }; + + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + updateScript = writeScript "update-palemoon-bin" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl libxml2 + + set -eu -o pipefail + + # Only release note announcement == finalized release + version="$( + curl -s 'http://www.palemoon.org/releasenotes.shtml' | + xmllint --html --xpath 'html/body/table/tbody/tr/td/h3/text()' - 2>/dev/null | head -n1 | + sed 's/v\(\S*\).*/\1/' + )" + + for variant in gtk3 gtk2; do + # The script will not perform an update when the version attribute is up to date from previous platform run + # We need to clear it before each run + update-source-version palemoon-bin 0 "${lib.fakeHash}" --source-key="sources.$variant" + update-source-version palemoon-bin "$version" --source-key="sources.$variant" + done + ''; }; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 5e150662274b9..851f2c49f280b 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.11"; + version = "13.0.14"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "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-a8BAesBp85oaHJrkQYcYufH9cy7OrFrfnljZZrFPlGE="; + hash = "sha256-UWR2zMVXa6QMz1EIWJf43Vmj14ZIaug105esxeSd0KU="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "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-cyZnLcJmXNjBJhBLwBoW09K6dsT6Og+h0ufc4/6zxac="; + hash = "sha256-n+qj3IY4z+erOg4iUkQ4CP3rtJASTeKPg7beZRdesw4="; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d7d26f183e230..442f899920c1f 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.6.3271.48"; + version = "6.6.3271.61"; 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-NeYyPgIioURSDomwZq7Cc08+A/XnQEk6yEiag7YxQO0="; - x86_64-linux = "sha256-/zBvH0IQZJr8PKWkIznPRxNLMxQoxVOnDrAw+0BWOEM="; + aarch64-linux = "sha256-Rcc/pufINOQJlkQI6KkWVZtnh3KvKLS6jRWQNTxPFmU="; + x86_64-linux = "sha256-Xt4pLB23VZ/j9g/QCOQTrrhQduxs1nB4wyYkBefFPIQ="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index bc1d81e7f9565..7e719e25c04ca 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.5"; + version = "3.6"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-w5QdFvF+kIxt27rg/uXjd+G0Dls7oYhmFew+O2NoaVg="; + hash = "sha256-FzJUmF2X4Iyf83cIEa8b8EFCcWUyYEZBVyvXuhiaaWM="; }; - vendorHash = "sha256-F9mzGP5b9dcmnT6TvjjbRq/isk1o8vM/5yxWUaZrnaw="; + vendorHash = "sha256-x/NgcodS/hirXJHxBHeUP9MgOBHq1yQWHprMrlpqsas="; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { description = "A command line tool for browsing Hacker News in your terminal"; homepage = "https://github.com/bensadeh/circumflex"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mktip ]; mainProgram = "clx"; }; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 00e471590ec42..26760429dfd48 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.2.1"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-aSAwDz7QSYbHfDA+/usGh7xCxSq+kBTB3eqMBf5XEa8="; + hash = "sha256-Fzi5g8bHBC5xao0iZ4I/SXLpEVaoUB+7UuQZhbfHw60="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 55028845e2cb1..63466a3efdbfa 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-txbs1SzAaV1nCl104m0Ht5DwzCmK+sBDn4rZ1newdLc="; }; - vendorHash = "sha256-1nolJLWkArzSKf11fzlvvgiCnvMYSu5MHRNAn1lryms="; + vendorHash = "sha256-QbjiQVclT8paEKYQmMwj5MLq40mAVh5Ji5VJJTOmEZI="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 3139252e65c75..7f3265cbd8bf4 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.10.3"; + version = "2.10.7"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-DaM3vNmZTz4zJTsmtgWwKPhHeUdqe2ZdlXYTppdhiJs="; + hash = "sha256-0C8lVQrFxrk9ym4aCz0PhUS2iByx9rj5Id0xFIq4Efc="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-O13zMtrXgW3SiJmAn64/QW/CJN0+d0h0MMyEWKsy9WE="; + vendorHash = "sha256-dgj8IXrLNZ6ZEIFAY/gXAklVKfLXosRuR1SyZWkwrwA="; # 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 b921d080a478a..39c14e95c60d4 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.6"; + version = "0.11.9"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-PCyPdUgvW2wCo1MZ/5jbPLfermbYKZKDbAFsc2goqlY="; + hash = "sha256-TJja4FL440ZG5VsCfJsKUYeM2YPlMSl2+ejjlgyP5IY="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 59c1d8664d55e..3eee88fa2ad5c 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.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-qtfMkCI1vX9aKWFNAhqCrnc5mhE+4kh2pogzv4oRXnE="; + hash = "sha256-OAIxBCfSDNauThC4/W//DmkzwwsNGZxdj3gDjSWmoNU="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-W3bX5fAxFvI1zQCx8ioNIc/yeDAXChpxNPYyaghnxxE="; + vendorHash = "sha256-ppg8AFS16Wg/J9vkqhiokUNOY601kI+oFSDI8IDJTI4="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 00c8805f3cfa3..0c371bfac2cd1 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.66.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8cEJw4gCyh3aosck70vdLVYGOL3zR0AOpAMNv/j6rEM="; + sha256 = "sha256-H2RyxUeOgIiGpR50sDP6bjZ6BKRB47oLUpdtawSRnmo="; }; - vendorHash = "sha256-k03pRrUzHvVjKt6w40JEiJTvbwhKa/0rjkZQsnmfe68="; + vendorHash = "sha256-dJJPq2HcGZ+MqtJ848gsrvzD1rMVrwJQKwq+UpZsFB0="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; @@ -38,6 +38,6 @@ buildGoModule rec { description = "Universal Tool for DevOps and Cloud Automation (works with terraform, helm, helmfile, etc)"; mainProgram = "atmos"; license = licenses.asl20; - maintainers = with maintainers; [ rb ]; + maintainers = with maintainers; [ ] ++ teams.cloudposse.members; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 0daf7ae97ba12..cbd2512acba59 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.5"; + version = "7.5.6"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LjqMCkEIl+0psxIys/tvJPkEQqDRzLOsaFUfAVG+RrE="; + sha256 = "sha256-aw1iS7iAs8Xj7K7gTRp1bvq4po3Aq8zakm7FLKC0DEY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 145c5d332e00c..91f2b105decb0 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.27.2"; + version = "3.27.3"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-iVRK/5vjPnfJMULaufaOu8u09utSt3u85R4cIBl+yUI="; + hash = "sha256-WZcQfZ5ocuimI5gtr5I5LjKxukK07au6iP9N2+vwN1M="; }; - vendorHash = "sha256-h4qTtMG4Xi6YqLMMsXZRWVVdQ3U3VrFG6bV7YDwT5Zk="; + vendorHash = "sha256-ptMec5gL6WTCG/2aHesU8fJwMzMnfuvEn9S68M5y4Eo="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 2174bd7bc6584..5502c5c582f16 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.0"; + version = "0.16.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-RJJETvgLdE/fJtd1LMShJ7Hm8/s1zUybhec6YPT44wg="; + hash = "sha256-fhTjYhRCtJu18AGYF6hiTdRMEdlNO+DmDwh2hZBXzPk="; }; vendorHash = null; @@ -37,11 +37,12 @@ buildGoModule rec { --zsh <($out/bin/cilium completion zsh) ''; - meta = with lib; { + meta = { + changelog = "https://github.com/cilium/cilium-cli/releases/tag/v${version}"; description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico bryanasdev000 qjoly ]; + maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index d2f913a765ed7..44f87f0e1c9fe 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.76"; + version = "1.0.81"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Bk0YfW9KDliaJIqpVxCXTy7EiGGJPZTXcn6SFEmywRE="; + sha256 = "sha256-YdrJbT9Ozp1vlvQBYQNjJX6n3vIXYj3dmKhAsBPrvi8="; }; - vendorHash = "sha256-22n+ks1D65Gk2acCMHxgj19VHDf4B23ivqHfo3J45j0="; + vendorHash = "sha256-YNbxV79XQBmd7oTanwLOMdmt2ds4ttX1ttr8vUycVzg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 5f1259b351b81..d510549f767be 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.8"; + version = "8.7.10"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-86FY7SfVZ9aEC72VP7KWj3p+wbAyLXLYtugP+Iv0G80="; + sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0="; }; - vendorHash = "sha256-Y46d8g4KoS5DjMMnX8YjgJYg6ax891vlgH9INZZflJI="; + vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 6fdeb802ea1cf..d5079b36886f9 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg="; + hash = "sha256-32rmfBjPtc9w+B8PIb8sFOIlzZ7PnS6XSZRNLreMVl4="; }; - vendorHash = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; + vendorHash = "sha256-JWaQacekMQGT710U5UgiIpmEYgyUCh1uks5eSV5nhWc="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 5eed2c4afe6c3..ecdd2303e744d 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.18.1"; + version = "1.19.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-EHyCdOimHIGlggjDnXmgk0+hBDfOjEvIafMMNSCeRak="; + sha256 = "sha256-MRnG2zqPSBPe/OHInKxGER350MuXEqJk2gs6O3KQv4Y="; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://flink.apache.org"; downloadPage = "https://flink.apache.org/downloads.html"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; maintainers = with maintainers; [ mbode autophagy ]; }; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 709ab087d26af..3f3b08f398143 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -8,8 +8,8 @@ let version = "2.2.3"; - sha256 = "12rrai56hl86213lsi8i4qrah0v7a36nks38g5373imyl9g497ym"; - manifestsSha256 = "1hmzmzijpx49hh2ykv7vw3jp02dxr4qn3r1dma56g7b4nbk7aa8x"; + sha256 = "sha256-1Z9EXqK+xnFGeWjoac1QZwOoMiYRRU1HEAZRaEpUOYs="; + manifestsSha256 = "sha256-HSl15rJknWeKqi3kYTHJvQlw5eD77OkFhIn0K+Ovv8I="; manifests = fetchzip { url = diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index f252d587daaf3..1763b37d33285 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -12,7 +12,9 @@ LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//') if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz) + SHA256=$(nix hash to-sri --type sha256 $SHA256) SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz) + SPEC_SHA256=$(nix hash to-sri --type sha256 $SPEC_SHA256) setKV () { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/default.nix" diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 07234c75ff8e2..c6b1c0edb2a44 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.29"; + version = "0.6.31"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-hN9Kok2+ZNYZsG+3ffzr1jGfIMg99JzgzC0x585KDF4="; + hash = "sha256-tL5mygomRdxHdWUAp6umMOhyKq/ZFcjn+5wZcqD2mVA="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index ffe98a73c9048..67a7f12f2d8a1 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.16.8"; + version = "1.16.10"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-M8ZNDt+sO8ZtVM1PyISOsFwXrD6q9ACPG0T99bqwk1c="; + hash = "sha256-GC0/HGPO/sbkyf2bLY0A+pQrPYqMv6BP0zNUHENpQjg="; }; vendorHash = "sha256-UyzqKpF2WBj25Bm4MtkF6yjl87A61vGsteBNCjJV178="; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index d5bae9ad885b7..5f44e39d008cf 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -35,7 +35,7 @@ let src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; - inherit (platformAttrs.${stdenv.system}) hash; + inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash; }; doCheck = true; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 4952f4db1e612..dfd3f4f08ea94 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.11.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - hash = "sha256-w4QV96/02Pbs/l0lTLPYY8Ag21ZDDVPdgvuveiKUCoM="; + hash = "sha256-lSGgT+aWp4NgiIoCnR4TNdecEqIZVnKMmGtEingq05o="; }; - vendorHash = "sha256-6byD8FdeqdRDNUZFZ7FUUdyTuFOO8s3rb6YPGKdwLB8="; + vendorHash = "sha256-LpARmDupT+vUPqUwFnvOGKOaBQbTuTvQnWc5Q2bGBaY="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index b46ed8f329b1c..15599846c7197 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.14.3"; + version = "3.14.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-GC9rkB35m+a/9pEvD7aNjE4z3qrv33NES842crrzD3I="; + sha256 = "sha256-Wt5ovKa2CHrD0VSxvReYAwoC4SsuZHAhi/P6Kn1H7So="; }; - vendorHash = "sha256-f5tLyq9tP5tdE73Mlee9vAUSHqkUAtAJkwjZP/K6wPM="; + vendorHash = "sha256-b25LUyr4B4fF/WF4Q+zzrDo78kuSTEPBklKkA4o+DBo="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 8e0a72251ca3d..78ff59860bb82 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.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-51Cx8V0cvuyBLFVmOWpA8X/kpDR67Q5EYZct44ED/ys="; + hash = "sha256-C1aHnKNXgzlPT1qMngRcPZ6hYUOenU1xpeYLnhrvtnc="; }; - vendorHash = "sha256-6tXQ2fbn1ZzImx8luxetXHNj3gIUt217rjXJPxMpjTw="; + vendorHash = "sha256-nm1LFy2yqfQs+HmrAR1EsBjpm9w0u4einLbVFW1UitI="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index d9e5bbecca434..76b53453dac9f 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.13.0"; + version = "0.13.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jFzxAzLv3EfqWgbXsN8d0OPY8pDy7OBjJIzr+x5yFF0="; + sha256 = "sha256-tHkLUoccOUcUjODecy1QyeuDb/aXv67sK8JHJ1IspC8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 8f22d01a4601e..6c05705e565cc 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.20.3"; + version = "1.21.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-NimwuQj/EvWtXt87LgHWwcZ2hAd548o/agXY4TVK63o="; + hash = "sha256-zWg0UK9RHq/25GWpsvb/U5YJPkgd7aUC/Dva8jGFwfo="; }; - vendorHash = "sha256-4HzUsTLt4R35TS4jKOmrKW0At9q8W61TU+NTQ/K7Axk="; + vendorHash = "sha256-23t1xJPRip0ojXmUl1qlk6QJsYHT+9EAS080m6c0d6U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 722c8401da2ac..674adcf585d6a 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-E9EIyBDYsLqfKsb25o1SEh0lUAT/xEtcHHlkunS5Meg="; + hash = "sha256-NHfS1iJtpt0t2iIqXBETiD4rpA2XzA8eOg5mP4N8El4="; }; - vendorHash = "sha256-0P1v7mZ+k7Th8/cwxRNlhDodzyagv0V9ZBXy1BUGk+k="; + vendorHash = "sha256-MPTdOcNoveBnHMJ2YHqHuvOHHe6IdisZLc05qViA1YQ="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index efca8313d5847..6ac3414b1b0e5 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.26.14+k3s1"; - k3sCommit = "c7e6922aa84369b3c0d28bb800e67bb162895a1c"; - k3sRepoSha256 = "1spvyyzk711g4ik1pv21xaasy7va5l5gcvbfkamfv4ijn0wz4mjx"; - k3sVendorHash = "sha256-ursq2Vq1J9MdkwDl3kKioxizhR46yo2urNc3VpwVH2A="; + k3sVersion = "1.26.15+k3s1"; + k3sCommit = "132972364806998c35d250153e2af245f9ecf18d"; + k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9"; + k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index de7fbe181351b..928337553966c 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.27.11+k3s1"; - k3sCommit = "06d6bc80b469a61e5e90438b1f2639cd136a89e7"; - k3sRepoSha256 = "0qkm8yqs9p34kb5k2q0j5wiykj78qc12n65n0clas5by23jrqcqa"; - k3sVendorHash = "sha256-+z8pr30+28puv7yjA7ZvW++I0ipNEmen2OhCxFMzYOY="; + k3sVersion = "1.27.12+k3s1"; + k3sCommit = "78ad57567c9eb1fd1831986f5fd7b4024add1767"; + k3sRepoSha256 = "1j6xb3af4ypqq5m6a8x2yc2515zvlgqzfsfindjm9cbmq5iisphq"; + k3sVendorHash = "sha256-65cmpRwD9C+fcbBSv1YpeukO7bfGngsLv/rk6sM59gU="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index 24e04c89aca9f..b8e68bb877404 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.28.7+k3s1"; - k3sCommit = "051b14b248655896fdfd7ba6c93db6182cde7431"; - k3sRepoSha256 = "1136h9xwg1p26lh3m63a4c55qsahla0d0xvlr09qqbhqiyv7fn0b"; - k3sVendorHash = "sha256-FzalTtDleFIN12lvn0k7+nWchr6y/Ztcxs0bs2E4UO0="; + k3sVersion = "1.28.8+k3s1"; + k3sCommit = "653dd61aaa2d0ef8bd83ac4dbc6d150dde792efc"; + k3sRepoSha256 = "0pf8xw1m56m2s8i99vxj4i2l7fz7388kiynwzfrck43jb7v7kbbw"; + k3sVendorHash = "sha256-wglwRW2RO9QJI6CRLgkVg5Upt6R0M3gX76zy0kT02ec="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index fcdd8e91a215a..cf1f57e0fe601 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.29.2+k3s1"; - k3sCommit = "86f102134ed6b1669badd3bfb6420f73e8f015d0"; - k3sRepoSha256 = "0gd35ficik92x4svcg4mlw1v6vms7sfw1asmdahh16li4j27wdz5"; - k3sVendorHash = "sha256-KG795CA3l+iCdJlYMNTQLmv3YqmtM2juacbsmH7B//M="; + k3sVersion = "1.29.3+k3s1"; + k3sCommit = "8aecc26b0f167d5e9e4e9fbcfd5a471488bf5957"; + k3sRepoSha256 = "12285mhwi6cifsw3gjxxmd1g2i5f7vkdgzdc6a78rkvnx7z1j3p3"; + k3sVendorHash = "sha256-pID2h/rvvKyfHWoglYPbbliAby+9R2zoh7Ajd36qjVQ="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/README.md b/pkgs/applications/networking/cluster/k3s/README.md index df2bead6be530..c01a9ceab817f 100644 --- a/pkgs/applications/networking/cluster/k3s/README.md +++ b/pkgs/applications/networking/cluster/k3s/README.md @@ -71,3 +71,44 @@ In order to resolve this issue, we propose backporting not just new patch releas In the above example, where NixOS 23.05 included k3s 1.26, and 23.11 included k3s 1.28, that means we would backport 1.27 to the NixOS 23.05 release, and backport all patches for 1.26 and 1.27. This would allow someone to upgrade between those NixOS releases in a supported configuration. + + +## K3s upkeep for nixpkgs maintainers + +* After every nixos release, K3s maintainers should remove from `nixos-unstable` all K3s versions that exist in `nixos-stable` except the latest version (to allow decoupling system upgrade from k3s upgrade). + +* Whenever adding a new major/minor K3s version to nixpkgs: + - update `k3s` alias to the latest version. + - add a NixOS release note scheduling the removal of deprecated K3s packages + - include migration information from both Kubernetes and K3s projects + +* For version patch upgrades, use the K3s update script. + + To execute the update script, from nixpkgs git repository, run: + + > ./pkgs/applications/networking/cluster/k3s/update-script.sh "29" + + "29" being the target minor version to be updated. + + On failure, the update script should be fixed. On failing to fix, open an issue reporting the update script breakage. + + RyanTM bot can automatically do patch upgrades. Update logs are available at: https://r.ryantm.com/log/k3s_1_29/ + +* When reviewing upgrades, check: + + - At top-level, every K3s version should have the Go compiler pinned according to `go.mod` file. + + Notice the update script does not automatically pin the Go version. + + - K3s passthru.tests (Currently: single-node, multi-node, etcd) works for all architectures (linux-x86_64, aarch64-linux). + + For GitHub CI, [OfBorg](https://github.com/NixOS/ofborg) can be used to test all platforms. + + To test locally, at nixpkgs repository, run: + > nix build .#k3s_1_29.passthru.tests.{etcd,single-node,multi-node} + + Replace "29" according to the version that you are testing. + + - Read the nix build logs to check for anything unusual. (Obvious but underrated.) + +* Thanks for reading the documentation and your continued contribution. diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 01659d9236c82..b5f017b85b053 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -83,7 +83,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 yajo ]; + maintainers = with maintainers; [ euank mic92 superherointj yajo ]; platforms = platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 3fa2d5f5bc956..5f358587c4a48 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.28"; + version = "0.3.29"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-VDVCkGTLoAZZyTX+zn43KisnUV9XQ9xo9ZIQf3AwDcY="; + hash = "sha256-SYMgImnNqkP0A8EzR2btpVPb37G4Oxyb+Am//lXxTxU="; }; vendorHash = "sha256-NOXySV9sQl4Q1eDbcGMk0msMSosjyxYyJfhu7hd/4gw="; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index fac829c936e7c..274bff5d253fe 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.32.3"; + version = "0.32.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-rw+MoMI/VmFvCE94atfP+djg+N75qwRfxjRlyCvLxR8="; + hash = "sha256-0MAnN1ekzHLs25EspDN3xacmDvwXGwKO/5RsCMMwTI8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ="; + vendorHash = "sha256-Eaz56iU862KDAlVPuMo8qPuWSFCxEFcJ3Qubl9TUiyI="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 19fcad4c51eb8..4bf3357f31f83 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.21.1"; + version = "1.22.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-mVoXJPNkG0VPTaZ1pg6oB5qa/bYQa9Gn82CoGRsVwWg="; + hash = "sha256-EL54lr5i6F4F9sdjQJZ3X+mmj4tWXVX2db8CkRe8WzI="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 383ac0e15f015..b87c022d67a8e 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-NeLMHecfDyMhXmq1HO3qRIWeYpkoj9Od5wWStZEkHYU="; + hash = "sha256-NNCV/+Jh/tjc7SC4E9/gtiVthVmAxZBOyW3MFISbkH4="; }; - vendorHash = "sha256-EIvwzgpC9Ls43RJEhxNYDlF4luKthFgJleaXcYzOYow="; + vendorHash = "sha256-CKOZxmUVZWFb7cc+amPwyMv5ScujWeipEqm95m63SYk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 522209d591836..d79eeef266926 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/blendle/kns"; license = licenses.isc; maintainers = with maintainers; [ mmlb ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index c462e4d1d6022..a4266094c4e92 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -14,21 +14,20 @@ GEM addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) colorize (0.8.1) concurrent-ruby (1.2.3) connection_pool (2.4.1) domain_name (0.6.20240107) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) ejson (1.4.1) faraday (2.9.0) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http ffi (1.16.3) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) @@ -49,12 +48,13 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jsonpath (1.1.5) multi_json - jwt (2.7.1) - krane (3.5.0) + jwt (2.8.1) + base64 + krane (3.5.1) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -75,30 +75,29 @@ GEM rake (~> 13.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0206) - minitest (5.22.2) + mime-types-data (3.2024.0305) + minitest (5.22.3) multi_json (1.15.0) mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) os (1.1.4) - public_suffix (5.0.4) - rake (13.1.0) + public_suffix (5.0.5) + rake (13.2.0) recursive-open-struct (1.1.3) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - ruby2_keywords (0.0.5) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.6.1) - thor (1.3.0) + statsd-instrument (3.7.0) + thor (1.3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uri (0.13.0) @@ -110,4 +109,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.5.5 + 2.5.6 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 9f0aad62cc5d5..501c449dd5eff 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; + sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; type = "gem"; }; - version = "7.1.3"; + version = "7.1.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.7"; }; colorize = { groups = ["default"]; @@ -82,15 +82,14 @@ version = "0.6.20240107"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; ejson = { groups = ["default"]; @@ -140,10 +139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + sha256 = "1844j58cdg2q6g0rqfwg4rrambnhf059h4yg9rfmrbrcs60kskx9"; type = "gem"; }; - version = "1.0.1"; + version = "1.3.2"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -215,10 +214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.4"; }; jsonpath = { dependencies = ["multi_json"]; @@ -232,14 +231,15 @@ version = "1.1.5"; }; jwt = { + dependencies = ["base64"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; + sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.1"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "multi_json" "statsd-instrument" "thor"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j4vrb55akvpg08vfwvfawf9qbjv9dyiw32g57va89yq371qjasp"; + sha256 = "1wnx86ars7csb2sxn69rb654p5xpz6xlygkx4mbyw1abgzyr2ap0"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -290,20 +290,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; + sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; type = "gem"; }; - version = "3.2024.0206"; + version = "3.2024.0305"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; type = "gem"; }; - version = "5.22.2"; + version = "5.22.3"; }; multi_json = { groups = ["default"]; @@ -361,20 +361,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.5"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "0lwv4rniry7k9dvz1n462d7j0dq9mrl6a95y6cvs6139h0ksxhgn"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.0"; }; recursive-open-struct = { groups = ["default"]; @@ -397,16 +397,6 @@ }; version = "2.1.0"; }; - ruby2_keywords = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; - }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -423,20 +413,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1psmiygzad3j4l0vzh2x48cmk4v6q87yg8ndvnp9jkcsbik77bzx"; + sha256 = "14blk2vvcmr0xycd3bzlr36nz5wn7m7ana2mljfm4zxgwx5vj7h7"; type = "gem"; }; - version = "3.6.1"; + version = "3.7.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index 6fad5b344c0d6..5515d10dfd99b 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.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - hash = "sha256-KR5lBLgzv9yjL3JvCjg8dxXWmPgagnnKxYtrPunAyXY="; + hash = "sha256-1sAkNueP8qGwPwdX0oSJfB/oGvna6+G8Cay+3vGJ2IE="; }; - vendorHash = "sha256-vaWdJyPOLsrLrhipBvUCOHo/TjnJz4Qpvj3lvUPHomU="; + vendorHash = "sha256-iv0OJLhIZpdem2/JFirJnvmU44ylTomgB8UqCGqHbwA="; subPackages = [ "cmd/client" ]; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 55f29f0deb476..b50320d7c1a06 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-em+I2YICcqljaaNQ+zOAnOZ552elmV6Ywbfla8buwaY="; + hash = "sha256-TMKixwZonYGPXIqOtgnuilbH7BaIRyqJU6uKtp9ANKM="; }; - vendorHash = "sha256-iBwhpVs9u5AQAvmzb69SaewdYHmmaV19Bstd0Tux9CA="; + vendorHash = "sha256-Hl01dFSffYv59zensKTjXWLXxwfkQYAO5xadlc5iBJY="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 436138d8560dd..98a656f23859f 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,22 +2,23 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-G2FvKnO+YuLlRlzfB1YMRhCHWa6v4sMFLyDqp12bzn4="; + hash = "sha256-u5lzCIbSIOrhI2OE2PprvNZv7KetYGntyADVftSJrkY="; }; - vendorHash = "sha256-IrSx1iCOd95CWyLo6WuEtTFm6p62se/t8dcBmH5eOP4="; + vendorHash = "sha256-ZsSzLIVVoKZZEZOIYJTNl0DGere3sKfXsjXbRVmeYC4="; CGO_ENABLED = 0; ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X github.com/inspektor-gadget/inspektor-gadget/cmd/common.version=v${version}" + "-X main.gadgetimage=ghcr.io/inspektor-gadget/inspektor-gadget:v${version}" "-extldflags=-static" ]; @@ -32,6 +33,6 @@ buildGoModule rec { mainProgram = "kubectl-gadget"; homepage = "https://inspektor-gadget.io"; license = licenses.asl20; - maintainers = with maintainers; [ kranurag7 ]; + maintainers = with maintainers; [ kranurag7 devusb ]; }; } diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 044e12837c9d2..06ede90ffb67c 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kubectl-klock"; - version = "0.5.1"; + version = "0.6.1"; nativeBuildInputs = [ makeWrapper ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "applejag"; repo = pname; rev = "v${version}"; - hash = "sha256-q7Wq1mTjOB7tT66+LWIwwqltQcQSHD/VHLO7nCTZTQ0="; + hash = "sha256-QzleoHRQ/A5ImMl43kze5ppUdiLa4n/VT02lMnaXVkg="; }; - vendorHash = "sha256-3CJ/tmFFkmq6wHxbqk8u+GxxbSrUpB/JD5s/S7hegB8="; + vendorHash = "sha256-smE8mdyZ8xJOevgHs4+ozS6VOlko+Whhs/37B+hIbxo="; postInstall = '' makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock b/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock index f7acb320b36b5..452130670decf 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,17 +19,33 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -40,55 +56,63 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", + "colorchoice", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +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 = "0.2.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "flate2", "futures-core", @@ -105,9 +129,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -120,39 +144,48 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "base64" -version = "0.20.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[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 = "bumpalo" -version = "3.12.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -162,77 +195,64 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.4", ] [[package]] name = "clap" -version = "4.2.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "color-eyre" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" dependencies = [ "backtrace", "color-spantrace", @@ -245,9 +265,9 @@ dependencies = [ [[package]] name = "color-spantrace" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", "owo-colors", @@ -256,77 +276,84 @@ dependencies = [ ] [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "concolor-query" -version = "0.3.3" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "windows-sys", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] -name = "cxx" -version = "1.0.94" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "generic-array", + "typenum", ] [[package]] -name = "cxx-build" -version = "1.0.94" +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.13", + "powerfmt", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.94" +name = "diff" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "block-buffer", + "crypto-common", ] [[package]] @@ -352,9 +379,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -363,31 +390,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] -name = "errno" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -395,9 +407,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -410,40 +422,19 @@ 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" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" 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 = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -456,9 +447,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -466,15 +457,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -483,38 +474,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -529,6 +520,16 @@ dependencies = [ ] [[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" @@ -540,53 +541,53 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -595,9 +596,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -606,9 +607,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -618,15 +619,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -646,21 +647,19 @@ dependencies = [ ] [[package]] -name = "hyper-openssl" -version = "0.9.2" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", - "linked_hash_set", - "once_cell", - "openssl", - "openssl-sys", - "parking_lot", + "log", + "rustls", + "rustls-native-certs", "tokio", - "tokio-openssl", - "tower-layer", + "tokio-rustls", ] [[package]] @@ -677,33 +676,32 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.54" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -717,79 +715,69 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] [[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys", + "hermit-abi", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] -name = "jsonpath_lib" -version = "0.3.0" +name = "jsonpath-rust" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa63191d68230cccb81c5aa23abd53ed64d83337cacbb25a7b8c7979523774f" +checksum = "06cc127b7c3d270be504572364f9569761a180b981919dd0d87693a7f5fb7829" dependencies = [ - "log", - "serde", + "pest", + "pest_derive", + "regex", "serde_json", + "thiserror", ] [[package]] name = "k8s-openapi" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1985030683a2bac402cbda61222195de80d3f66b4c87ab56e5fea379bd98c3" +checksum = "edc3606fd16aca7989db2f84bb25684d0270c6d6fa1dbcd0025af7b4130523a6" dependencies = [ - "base64 0.20.0", + "base64", "bytes", "chrono", "serde", @@ -799,9 +787,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.80.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414d80c69906a91e8ecf4ae16d0fb504e19aa6b099135d35d85298b4e4be3ed3" +checksum = "3499c8d60c763246c7a213f51caac1e9033f46026904cb89bc8951ae8601f26e" dependencies = [ "k8s-openapi", "kube-client", @@ -810,27 +798,28 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.80.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dc5ae0b9148b4e2ebb0dabda06a0cd65b1eed2f41d792d49787841a68050283" +checksum = "033450dfa0762130565890dadf2f8835faedf749376ca13345bcd8ecd6b5f29f" dependencies = [ - "base64 0.20.0", + "base64", "bytes", "chrono", - "dirs-next", "either", "futures", + "home", "http", "http-body", "hyper", - "hyper-openssl", + "hyper-rustls", "hyper-timeout", - "jsonpath_lib", + "jsonpath-rust", "k8s-openapi", "kube-core", - "openssl", "pem", "pin-project", + "rustls", + "rustls-pemfile", "secrecy", "serde", "serde_json", @@ -846,9 +835,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.80.0" +version = "0.87.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98331c6f1354893f7c50da069e43a3fd1c84e55bbedc7765d9db22ec3291d07d" +checksum = "b5bba93d054786eba7994d03ce522f368ef7d48c88a1826faa28478d85fb63ae" dependencies = [ "chrono", "form_urlencoded", @@ -862,7 +851,7 @@ dependencies = [ [[package]] name = "kubectl-view-allocations" -version = "0.16.3" +version = "0.18.1" dependencies = [ "anyhow", "chrono", @@ -871,11 +860,10 @@ dependencies = [ "itertools", "k8s-openapi", "kube", - "openssl", + "pretty_assertions", "prettytable-rs", "serde", "serde_json", - "spectral", "thiserror", "tokio", "tracing", @@ -892,45 +880,26 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[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" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "linked_hash_set" -version = "0.1.4" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "linked-hash-map", + "bitflags 2.4.2", + "libc", + "redox_syscall", ] [[package]] -name = "linux-raw-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" - -[[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -938,12 +907,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "matchers" @@ -951,192 +917,92 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1" -dependencies = [ - "num-integer", - "num-traits", - "rand", - "rustc-serialize", -] - -[[package]] -name = "num-complex" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656" -dependencies = [ - "num-traits", - "rustc-serialize", + "wasi", + "windows-sys 0.48.0", ] [[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-rational" -version = "0.1.42" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" -dependencies = [ - "num-bigint", - "num-integer", - "num-traits", - "rustc-serialize", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" 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.49" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[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.13", -] - -[[package]] -name = "openssl-src" -version = "111.25.2+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.84" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] @@ -1159,57 +1025,103 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-targets 0.48.5", ] [[package]] name = "pem" -version = "1.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.13.1", + "base64", + "serde", ] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293" +dependencies = [ + "once_cell", + "pest", + "sha2", +] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1218,10 +1130,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.26" +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] [[package]] name = "prettytable-rs" @@ -1238,86 +1160,52 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.55" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[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 = "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.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "regex-syntax", + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -1326,7 +1214,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "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.2", ] [[package]] @@ -1336,69 +1235,111 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rustc-serialize" -version = "0.3.24" +name = "rustls" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] [[package]] -name = "rustix" -version = "0.37.6" +name = "rustls-native-certs" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys", + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scratch" -version = "1.0.5" +name = "sct" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "secrecy" @@ -1411,10 +1352,33 @@ dependencies = [ ] [[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "serde" -version = "1.0.159" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -1431,22 +1395,21 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ - "indexmap", "itoa", "ryu", "serde", @@ -1454,21 +1417,33 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" dependencies = [ "indexmap", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", ] [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -1484,43 +1459,34 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "spectral" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae3c15181f4b14e52eeaac3efaeec4d2764716ce9c86da0c934c3e318649c5ba" -dependencies = [ - "num", + "windows-sys 0.52.0", ] [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "static_assertions" @@ -1530,26 +1496,15 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[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" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" -version = "2.0.13" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -1558,11 +1513,11 @@ dependencies = [ [[package]] name = "tame-oauth" -version = "0.8.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa56576cb543707e19361a4c69431c37a712e85e4472aff0834a6c31f8df833" +checksum = "fd95ca1e8f5d9d3e83a626370af9ff1356ed1605ad128d99f9bea57432c112be" dependencies = [ - "base64 0.13.1", + "data-encoding", "http", "ring", "serde", @@ -1583,39 +1538,30 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[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", @@ -1623,22 +1569,14 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1646,16 +1584,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -1676,11 +1615,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -1690,7 +1629,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1705,32 +1644,30 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn", ] [[package]] -name = "tokio-openssl" -version = "0.6.3" +name = "tokio-rustls" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "futures-util", - "openssl", - "openssl-sys", + "rustls", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -1759,19 +1696,20 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", - "base64 0.13.1", - "bitflags", + "base64", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", + "mime", "pin-project-lite", "tokio", "tokio-util", @@ -1794,11 +1732,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -1807,27 +1744,27 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "tracing-bunyan-formatter" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a348912d4e90923cb93343691d3be97e3409607363706c400fc935bb032fb0" +checksum = "b5c266b9ac83dedf0e0385ad78514949e6d89491269e7065bee51d2bb8ec7373" dependencies = [ "ahash", "gethostname", "log", "serde", "serde_json", - "time 0.3.20", + "time", "tracing", "tracing-core", "tracing-log", @@ -1836,9 +1773,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -1856,20 +1793,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "once_cell", @@ -1882,9 +1819,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" @@ -1897,43 +1834,61 @@ dependencies = [ ] [[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[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 = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -1953,12 +1908,6 @@ 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_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1966,31 +1915,24 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1998,24 +1940,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2023,32 +1965,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winapi" @@ -2067,106 +1999,180 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "winapi", + "windows-targets 0.52.4", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] [[package]] -name = "windows" -version = "0.46.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows-targets", + "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.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "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.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "yansi" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "linked-hash-map", + "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", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 046165f8f33ad..4d67c3786bdd5 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "kubectl-view-allocations"; - version = "0.16.3"; + version = "0.18.1"; src = fetchFromGitHub { owner = "davidB"; repo = pname; rev = version; - sha256 = "sha256-udi39j/K4Wsxva171i7mMUQ6Jb8Ny2IEHfldt3B8IoY="; + sha256 = "sha256-BM0TLzoXQg3m5fdQEnO/tErW8xmuljo74GprwEgJN8o="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix index 695d63db81654..7f22523e46bcd 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.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "elsesiy"; repo = pname; rev = "v${version}"; - hash = "sha256-IdbJQ3YCIPcp09/NORWGezqjbwktObN7TuQdq5uAN4A="; + hash = "sha256-5X5rOoERx6HoG3cOBpYm12anMXXDjTtHZzQOOlJeJSs="; }; - vendorHash = "sha256-Q6OosaHDzq9a2Nt18LGiGJ1C2i1/BRYGaNEBeK0Ohiw="; + vendorHash = "sha256-oQvmS05nev+ypfkKAlTN+JbzPux5iAzHsojW8SxtB70="; subPackages = [ "./cmd/" ]; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 2a3b6e63a9a81..ce2e92356db4c 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.42.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-i+0oQaEHMu3525mJTQyL+Me2DPFSpaIK1xGaPMR2M0s="; + sha256 = "sha256-ppsGSzgJvAHRGs6PGPNgE7nDbK8SPYBPNbAlGwocAZs="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index f73c2ebbf19e2..e4d704d6ff27d 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -1,26 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "kubefirst"; - version = "2.4.0"; + version = "2.4.5"; src = fetchFromGitHub { owner = "kubefirst"; - repo = pname; - rev = "v${version}"; - hash = "sha256-3WGItliwfJuyh0nTUJyCo2qXuvGZOfAH6XCIGxvF8bs="; + repo = "kubefirst"; + rev = "refs/tags/v${version}"; + hash = "sha256-CkssgMr/4VGNQHyvaPnXBOf6HdExnhB7MjpJ3yQ9kfI="; }; vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U="; - ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; + ldflags = [ + "-s" + "-w" + "-X=github.com/kubefirst/runtime/configs.K1Version=v${version}" + ]; doCheck = false; meta = with lib; { - description = "The Kubefirst CLI creates instant GitOps platforms that integrate some of the best tools in cloud native from scratch."; + description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; mainProgram = "kubefirst"; homepage = "https://github.com/kubefirst/kubefirst/"; + changelog = "https://github.com/kubefirst/kubefirst/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ qjoly ]; }; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index b2fa146b0bc30..b52a4887824cb 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.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JBP2lE1/46VB/oKgDlNTQ8RFpgIlQE0If5vND7dzo7A="; + sha256 = "sha256-mQSQrcLzEZqNpXNuZFCVk3FRcfkrtvN19VhwqyrmwIU="; }; - vendorHash = "sha256-EwL/aiq2jyojM1r7wNZkA07TswHy6MLUUPQJFnaDG4A="; + vendorHash = "sha256-Xh4htBknBW59xdJVYw7A7BT2GB5WW8SnV05is7dWAS8="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index c37fe18281c90..3c5cf3ee52d27 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-r2lx+R/TQxD/miCJK3V//N3gKiCrg/mneT9BS+ZqRiU="; + sha256 = "sha256-yN5tpe3ayQPhTlBvxlt7CD6mSURCB4lxGatEK9OThzs="; }; - vendorHash = "sha256-K24y41qpuyBHqljUAtNQu3H8BNqznxYOsvEVo+57OtY="; + vendorHash = "sha256-VJkqg2cnpYHuEYOv5+spoyRWFAdFWE7YIVYaN9OmIZM="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 11666ef5c0bf7..8f158f1cd5e80 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.29.3"; + version = "1.29.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-mtYxFy2d892uMLrtaR6ao07gjbThuGa7bzauwvJ0WOo="; + hash = "sha256-7Rxbcsl77iFiHkU/ovyn74aXs/i5G/m5h5Ii0y1CRho="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index ed5db3c9485da..d6a3f9826dff5 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.26.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-rOaczDGjocGpYEPJpMiveWE7sHU9L0Csx2nX0Z3IrBs="; + sha256 = "sha256-96yaWHRfEHjXYZ9Hsh9bXk5O5viSOYhmwJ18JCbtv2U="; }; - vendorHash = "sha256-UicMiSSSQzquNAHFpnWKbybimz3jjbBgWykhyRSU7ZI="; + vendorHash = "sha256-91GKy7tNKSOiJmpArgp56RXegYP7sdGpaRAxS9xwTXA="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index d798442c08445..66ecc4274fdd8 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.1.75"; + version = "52.2.1"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-3DKoYjAOYucK28D68GeM1S1kTxec9eMYFY6zQ8dZKNo="; + hash = "sha256-MmKkM4nc9FkZkQIURPz63ryl0yhvxBwOvxkjrsaa67U="; }; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index bfbfa1fa7ccf3..81a9145327b35 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubespy"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "pulumi"; repo = "kubespy"; - sha256 = "sha256-eSQl8K+a9YcKXE80bl25+alHoBG8T+LCYOd4Bd9QSdY="; + sha256 = "sha256-l/vOIFvCQHq+gOr38SpVZ8ShZdI1bP4G5PY4hKhkCU0="; }; - vendorHash = "sha256-brs4QIo4QoLHU95llBHN51zYcgQgN7kbMJDMy2OYOsk="; + vendorHash = "sha256-4q+eFMrcZsEdk1W7aorIrfS3oVAuD4V0KQ7oJ/5d8nk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 215492a73b1e3..14df6fa5c47d0 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.3"; + version = "2.2.6"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-C1Fw7E7lXy9BRj8bTVUMzPK6wBiL6A3VGDYUqdD2Rjs="; + hash = "sha256-Z+IXSmN1V0xRnhE/PpWv9dQIwfTztJRYaftY9KCIucc="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 9b8c8a2e1a3f7..2ae43e1efd360 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.6.1"; + version = "2.6.5"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-jSBuEDnb2KHAOhOldAzpxgqnDXH1N267Axs+clpo2uo="; + hash = "sha256-gZxlbapEYrp02YSvEYBtlbRT/F0ijoF76CfZFzBbsAI="; }; - vendorHash = "sha256-gvB3e9C5KnQwvn2eJPm0WYKlKSnOO9opGikgVA3WJN0="; + vendorHash = "sha256-kqC6CUezPt3Uj9zuHnQYbbEP564Ki4UYmqfZedUBO38="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/lens/common.nix b/pkgs/applications/networking/cluster/lens/common.nix deleted file mode 100644 index e14a176bf4640..0000000000000 --- a/pkgs/applications/networking/cluster/lens/common.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl }: -let - build = "2023.5.310801-latest"; -in -{ - pname = "lens-desktop"; - version = "6.5.2"; - sources = { - x86_64-darwin = fetchurl { - sha256 = "sha256-AGU1kOQEYBAGqWaxftqSNVdPEblPDujKSBjMeaVNx6M="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.dmg"; - }; - aarch64-darwin = fetchurl { - sha256 = "sha256-Xx+6GPAfjioTrqfFS7cFh6deraR+TtqLlwLbVQxfN8g="; - url = "https://api.k8slens.dev/binaries/Lens-${build}-arm64.dmg"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-DPgeAhM8k6RXg1Qw2bqJFLPh5q2o7Va6EAe/InQNXLg="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - }; - }; -} diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/applications/networking/cluster/lens/darwin.nix index e8f17422ec1ff..9b9b752b877ba 100644 --- a/pkgs/applications/networking/cluster/lens/darwin.nix +++ b/pkgs/applications/networking/cluster/lens/darwin.nix @@ -1,27 +1,20 @@ -{ lib, stdenv, undmg, fetchurl }: -let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; -in -stdenv.mkDerivation rec { - inherit (common) pname version; - src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); +{ stdenv, pname, version, src, meta, undmg }: - appName = "Lens"; +stdenv.mkDerivation { + inherit pname version src meta; - sourceRoot = "${appName}.app"; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; - buildInputs = [ undmg ]; installPhase = '' - mkdir -p "$out/Applications/${appName}.app" - cp -R . "$out/Applications/${appName}.app" + runHook preInstall + + mkdir -p "$out/Applications" + cp -R "Lens.app" "$out/Applications/Lens.app" + + runHook postInstall ''; - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks ]; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; + dontFixup = true; } diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 455065b070362..3e32f8778f74e 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,5 +1,41 @@ -{ stdenv, callPackage }: -if stdenv.isDarwin then - callPackage ./darwin.nix { } +{ stdenv +, callPackage +, fetchurl +, lib }: + +let + + pname = "lens-desktop"; + version = "2024.3.191333"; + + sources = { + x86_64-linux = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; + hash = "sha256-OywOjXzeW/5uyt50JrutiLgem9S1CrlwPFqfK6gUc7U="; + }; + x86_64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; + hash = "sha256-yf+WBcOdOM3XsfiXJThVws2r84vG2jwfNV1c+sq6A4s="; + }; + aarch64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; + hash = "sha256-hhd8MnwKWpvG7UebkeEoztS45SJVnpvvJ9Zy+y5swik="; + }; + }; + + src = fetchurl { + inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash; + }; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.lens; + maintainers = with maintainers; [ dbirks RossComputerGuy starkca90 ]; + platforms = builtins.attrNames sources; + }; + +in if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version src meta; } else - callPackage ./linux.nix { } + callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index 8a21ceb432daf..b54285fdafcc6 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,19 +1,16 @@ -{ lib, fetchurl, appimageTools, makeWrapper, nss_latest, stdenv }: +{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; - - inherit (common) pname version; - src = common.sources.${stdenv.hostPlatform.system} or (throw "Source for ${pname} is not available for ${system}"); name = "${pname}-${version}"; appimageContents = appimageTools.extractType2 { inherit name src; }; + in + appimageTools.wrapType2 { - inherit name src; + inherit name src meta; extraInstallCommands = '' @@ -29,12 +26,4 @@ appimageTools.wrapType2 { ''; extraPkgs = _: [ nss_latest ]; - - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks RossComputerGuy ]; - platforms = [ "x86_64-linux" ]; - }; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 88cd474392a0f..f40dc62474764 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.2.4"; - sha256 = "0hh2sfjvqz085hl2dpsa9zgr3dwpyc85gcbx0c7lzpjg411bxmim"; - vendorHash = "sha256-g1e1uY43fUC2srKK9erVFlJDSwWrEvq4ni0PgeCFaOg="; + version = "24.4.4"; + sha256 = "07p4cgl4myv7kv9pxvxrvsqnl3vkd9ay5hngx5g6xds2sc8va306"; + vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8="; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index e35b4cd07f380..f3f62e9407293 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -4,7 +4,8 @@ , unstableGitUpdater , poetry-core , nixops -, digital-ocean +, python-digitalocean +, pythonOlder }: buildPythonPackage { @@ -12,6 +13,8 @@ buildPythonPackage { version = "unstable-2022-08-14"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "nix-community"; repo = "nixops-digitalocean"; @@ -34,7 +37,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - digital-ocean + python-digitalocean ]; pythonImportsCheck = [ "nixops_digitalocean" ]; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 168f331378a6c..449691f6dd854 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.16"; + version = "0.8.18"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tuukO7y+aqgu/f1DBZNUkElRTbEeZn+zkfixnFwWWwY="; + sha256 = "sha256-/AfEnYBoCFc/XP5U6oxGDFU63q8llaeR91OPzZU7zm8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index f94cb28ce2f55..89891fd04046a 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,9 +82,9 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.6"; - sha256 = "sha256-rEWXQwkW/muX3D0An3WmHCoboPACFCrSG7Tyzor2wnQ="; - vendorHash = "sha256-95yUtNfN/50LjWHHReaB4/riUqy8J67099bP8Ua7gRw="; + version = "1.7.7"; + sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; + vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; 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 03d3737928a09..050674907082f 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nova"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-K4D8vCZxOPRalSDlAmva7Qm72EJ2Xdz20oqKKqkD6iA="; + hash = "sha256-3bSxMb/JFIy3b6N/94cXfGlUbPIm046O9m2KPan8YIs="; }; vendorHash = "sha256-c30B8Wjvwp4NnB1P8h4/raGiGAX/cbTZ/KQqh/qeNhA="; diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index 99195f8889d2a..f83347d0538e6 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.70"; + version = "0.1.73"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-J/CN1cxEcKiEt8WMg79nA4y0gp18vSDEsBqvYuQVaIk="; + sha256 = "sha256-hcbCUzC+E7VHmqATw/1LQxdMLiFibgYiWrQHpm3jZLA="; }; - vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE="; + vendorHash = "sha256-NP5LLP27hn8p2gUVO/qpdu1Yp3t8iarUUKR/FjU0Qlc="; # Strip the final binary. ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 1e381c7470fbd..451e209a7b36f 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.9.0"; + version = "2.9.4"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-5xC0D7XB1db3mxUkzIyvmVIxOlL8XX8Vxpmtf60BQNM="; + hash = "sha256-RF8JEmZpvUf8w89wRa+d3ItMFnInEoxxQzLJvrx1mZE="; }; - vendorHash = "sha256-EW8DURf6URPQQMakHnRuF9Xh5iKh2y4cz6XYgXQwJM4="; + vendorHash = "sha256-bAB2vMPHIcJaMobPukQyKiCq0Af0n4b5mjImTswGFTo="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index ed86002a564a1..451360df62d0e 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-JP7p6+0FK492C3nPOrHw/bHMpNits8MG2+rn8ofGT/0="; + sha256 = "sha256-O8P7biLlRCl/mhrhi9Tn5DSEv6/SbK4S6hcyQrN76Ds="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-6zTk+7RimDL4jW7Fa4zjsE3k5+rDaKNMmzlGCqEnxVE="; + vendorHash = "sha256-57Soek3iDlBPoZR3dw6Z/fY+UZTdrc3Cgc5ddAT3S0A="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 4c21b95265fba..547186ec51302 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.21.1"; + version = "0.21.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-zk3SMIvaFV6t+VCMvcmMaHpTEYx/LinaPLNXUU+JSwk="; + sha256 = "sha256-2+AV2gt67zLa7bRIfsxQIeB82iJba8Y4P0fq9273r7Q="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix index b55510e7e4cfa..c2d38e2a7c893 100644 --- a/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c="; + sha256 = "sha256-HeK8/IZTqkrJxfmNIYOm8/jY3Fbof8t7/emdHONvMZo="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0="; + vendorHash = "sha256-q8/Rb26ZY/Rn3FnESnAvPr+LrIvFFlSJnN6c0k8+sHg="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 435377d8e304c..6c9cd4d9b0aa5 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.6"; + version = "1.5.8"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-yw7GacSvPKXStmYtG4oQQlIca5Svk4pHDliMDVhyPRI="; + hash = "sha256-f1Ilf2HSsp0Ygp0fItJVd8iJq12Z1jw2WKmLR4NgUKA="; }; - vendorHash = "sha256-0H9K3/BwdSExADFHaYtn2RrHZ6AyEjzlBKYXL/Ow9JA="; + vendorHash = "sha256-/HsZAMPGCaM5Em6doC8qffoSEveX/yDNwAGog3I0+c4="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 19c4b280a60cb..d3c0e1fd3f202 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -4,7 +4,6 @@ , makeWrapper , jdk8 , python3 -, python310 , coreutils , hadoop , RSupport ? true @@ -63,20 +62,22 @@ let }); in { + # A note on EOL and removing old versions: + # According to spark's versioning policy (https://spark.apache.org/versioning-policy.html), + # minor releases are generally maintained with bugfixes for 18 months. But it doesn't + # make sense to remove a given minor version the moment it crosses this threshold. + # For example, spark 3.3.0 was released on 2022-06-09. It would have to be removed on 2023-12-09 if + # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08). + # A better policy is to keep these versions around, and clean up EOL versions just before + # a new NixOS release. spark_3_5 = spark rec { pname = "spark"; - version = "3.5.0"; - hash = "sha256-f+a4a23aOM0GCDoZlZ7WNXs0Olzyh3yMtO8ZmEoYvZ4="; + version = "3.5.1"; + hash = "sha256-ez6Hm8Ss3nl4mxOHyh67ugYH81/thNRMCja6MQ+9Tpg="; }; spark_3_4 = spark rec { pname = "spark"; version = "3.4.2"; hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk="; }; - spark_3_3 = spark rec { - pname = "spark"; - version = "3.3.3"; - hash = "sha256-YtHxRYTwrwSle3UpFjRSwKcnLFj2m9/zLBENH/HVzuM="; - pysparkPython = python310; - }; } diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index afc3b7bdf5aa4..3651d4652fc70 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - GOWORK = "off"; + env.GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index cf52f6d948eaa..2bf5719204520 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.35.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/o0UzjIUlRP936YG7fgfonPHc86z1WFCBcELor2frqE="; + sha256 = "sha256-no/F9PqChokG2so3LeptHYO3BXoqWFyMtY/5nlEMT8Y="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index c6e5ba9df7a9c..f9cfb3b3cba14 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.22.6"; + version = "1.23.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-L5TOFhAMfbKjNK/Q74V2lcZs5vyynvMZMhHFB1ay5F8="; + hash = "sha256-4e8z4k7loL9vVYe5jut1X/5qDboChQxZtPO1ZBHNb7o="; }; - vendorHash = "sha256-ItJ4Bng9TTGJpSHaNglODIheO2ZmntHl7QfK4+2I2CM="; + vendorHash = "sha256-4xwdVFE0CGcOA8Efj4ECionPP9rbzT02zyr2HR143AM="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 69bb5d9919725..f87cdff374f71 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.3.47"; + version = "1.3.48"; format = "setuptools"; src = fetchFromGitHub { owner = "terraform-compliance"; repo = "cli"; rev = "refs/tags/${version}"; - sha256 = "sha256-QJDKBM5CTOdF7oT42vL+Yp1UsQXWvkSZzo+WSsDxAZw="; + sha256 = "sha256-2nf/EJcC4KYTBItByX47UqTSs2EOgsUAgRbLEdB4Iyg="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 2454092e0051f..9e4d3d824f7b2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -86,6 +86,7 @@ let heroku = automated-providers.heroku.override { spdx = "MPL-2.0"; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); + minio = automated-providers.minio.override { spdx = "AGPL-3.0-only"; }; }; # Put all the providers we not longer support in this list. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 628a425506a3b..2428750c69619 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,14 +9,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-ZhL5u6v7ZraajKaSK6hwzXbXr+ySdFmBSJnmsOhOJok=", + "hash": "sha256-CFyB6jLHtnHxY9LB5a3qaMVfz6isi1pSXcscVMM9QKA=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", - "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.20.2", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eiWGI8sp+gGL8UiRBG6lHmCATVUebYwdXJbLNGfi6xY=" + "vendorHash": "sha256-wqXMoByVqd2NxdFunK29Hq59pfQoXW+kHoH0dTcfFVw=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -28,29 +27,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-7dKlhPGkt1WB/nlXV2IrNT7E3w2kNdishJB/xL299Cw=", + "hash": "sha256-6FcHqSXszJZkIX9wytkNU8+rKgBu34k2Xnfq6fcqkHs=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.13.2", + "rev": "v4.15.0", "spdx": "MIT", - "vendorHash": "sha256-rIyAhe4YQ9XG3nODCSxZRohHgNIPQ94pDLrh7+4Rj1k=" + "vendorHash": "sha256-SNpsdbNvgLOS8pSSvz58xThTqzCOOPZMggJb7HetzAw=" }, "akamai": { - "hash": "sha256-j1UTi4ygixwSfu9Wp//JzKe58xSV/tZM3kRo1ikBo3Y=", + "hash": "sha256-WOLEKdY8GbvAREbWQqAdITGVb4erHmIMp9GT2CsKvTk=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.6.0", + "rev": "v6.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/gW1vxaDaUMpm0QSghd/Glo3S/XVa5t9x3QrIs4Bqyk=" + "vendorHash": "sha256-g3U0w+gvrOzS8W3Cu+wpOlWo8JHUlBpxRkDDl6wzcXM=" }, "alicloud": { - "hash": "sha256-YD9q4sjX9Bmp1k6MIy7EKIT2fY0e9Mb939hJ5w1Hh2Y=", + "hash": "sha256-+3MgqAMcDfwhVW3zGSsjLfVWmVNWyrjtUqB9KYzdYRk=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.217.2", + "rev": "v1.220.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -73,22 +72,22 @@ "vendorHash": "sha256-buKYDNVCIcSDLCrCL4ZAKNQ7HqkH3+/7RHjyyR4dLmU=" }, "argocd": { - "hash": "sha256-nJrXbeI/07LlKngEkAnqPG6CiOLFTFugmZMVl2FEvIo=", + "hash": "sha256-dHIvMFz5XIxxBvBFsEw8lqi6yVoYM9E4tLIoTY+mdiQ=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v6.0.3", + "rev": "v6.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" + "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-W8IWBc9tWmj4Rkp4CgZV9tsAL41EOnEhH+iTImP/+D4=", + "hash": "sha256-qlmAOc4wSxQ9Xnr4zBB98OSFW4HB7w7yStsUNfsylsE=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v10.1.5", + "rev": "v10.4.3", "spdx": "Apache-2.0", - "vendorHash": "sha256-J/+OcqRtcHaqoDkrWIDpPlBHQ/UWupwchA1aeSoHSh4=" + "vendorHash": "sha256-P5L2Q8t9TxJnu5cjOwEKek1KNKAw78fqZoOSAo6AvzQ=" }, "auth0": { "hash": "sha256-Yoje6btftS0slz2newORBbb9kTjWXaXzbP94YKT6+3E=", @@ -100,13 +99,13 @@ "vendorHash": "sha256-kBLyk8glOuvgpbGLUUwtzKecqDDU8VS3JxN6tPIhMro=" }, "avi": { - "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", + "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", "homepage": "https://registry.terraform.io/providers/vmware/avi", "owner": "vmware", "repo": "terraform-provider-avi", - "rev": "v22.1.5", + "rev": "v22.1.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-r42KHzvRBXuWgLgtg+WUVt0ThjSMXtUKjEE9y/s/1uQ=" + "vendorHash": "sha256-Sq304WOdKx4J1sD1+YA7uDi+uQtUiXa+BISs/j87dWw=" }, "aviatrix": { "hash": "sha256-84MtHPrDVaLMQQYnAfuP/pZuzruWxUTLpziwn3ny1oU=", @@ -118,13 +117,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-/KJMoRsEKA4cqY/TpSWQDBpNjtqmZcqnpMSLf2E0LXY=", + "hash": "sha256-YykNKCDFPQCtES2vAbCbqbHbkx1EmVM0bTEylr84bqs=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.39.1", + "rev": "v5.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-q5Tsm7JLrX5OK4fKV0SBRgK6ZHogG16OtMFeJrR0bBc=" + "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" }, "azuread": { "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", @@ -136,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-HPbEbFw99HM6+a+EAbkwE6hvzh4/FU/cAbl6DT1dbp0=", + "hash": "sha256-kJ6snlePBGRqE8mS95ROzskz+b4cnPLz/OO1Vk+i56Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.94.0", + "rev": "v3.97.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,20 +154,20 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-wPfWcc4OD3KXEfe9IsK/4NPdX/4bQNKTiGBsKL0OZC8=", + "hash": "sha256-qLjAHoBnb6//QYxYZyN13RxWOuEjxwSOiPyfR1qMtro=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.37", + "rev": "v1.19.40", "spdx": "MPL-2.0", - "vendorHash": "sha256-puTQKvIvyBRgdZZTZCXEAdc8HYNgtoSmzjpqHCIEAKk=" + "vendorHash": "sha256-hd64VJOkl+BtMXR+VcGam8ycKdfuwmaj67cBxx6rS8w=" }, "bigip": { - "hash": "sha256-GrHd9plKhe7BdCBgsnTv+CM82F7oDPWamtXxOpiwKPE=", + "hash": "sha256-cGFlVcu8G7xpiHk1dhgLIkZHc6srOn/eLyQk9xETpnI=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.21.0", + "rev": "v1.22.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -191,13 +190,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-3r2vxoPRTehKTswcNoAkVKuLbo6OFuyLy1WEyjw2zO8=", + "hash": "sha256-DIquKLQB27deYYG3vMlhBoO/EZ5WK04zAR7qPrRQ38k=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MIT", - "vendorHash": "sha256-21OyBnW86A3Tm0OAHilCM+pgJcgx2a+P9up3/jeA8qg=" + "vendorHash": "sha256-1HYJ1k3ZK9rK/cDOXnJz556qqBkyikRxCBbOeJhl3Ks=" }, "checkly": { "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", @@ -227,13 +226,13 @@ "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-b9qsA0V/ncQPiP2SQyFpVDaQdEyAMBQp4WfCQlcd9xk=", + "hash": "sha256-p4jRSFNalEzIs8k1QZBVSUERmdK0qVYdk4oUoQRtQww=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.25.0", + "rev": "v4.29.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TBELRtWlzXqP64fPM3e1pn/w8FVERQ3BLf+kRoahNXk=" + "vendorHash": "sha256-HgTjVtC5Z7/3b86fFHTcZE4vUukWtBdWFdwgWGQW9ZQ=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -243,7 +242,7 @@ "repo": "terraform-provider-cloudfoundry", "rev": "v0.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-g1T6kH8Rv9bpvb6Q3YHCseEi1ayydJIxlplH3k12s8c=" + "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", @@ -255,11 +254,11 @@ "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" }, "cloudscale": { - "hash": "sha256-GjtWkty9mNMnTzXUf9U56b9HkjrjUdouA41ZptXMKeQ=", + "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.2.3", + "rev": "v4.3.0", "spdx": "MIT", "vendorHash": null }, @@ -292,13 +291,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-gmFD9VG9mcxw7lpt25bz8z2RnmeCSbd2EkFJHbZNP0Y=", + "hash": "sha256-zAu2zkC9saWg1Miu4OkqeXtNhGgboCzr/CRmtfFsAVc=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.37.0", + "rev": "v3.38.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-20ANWw/0rqhCVhkl2r1PusXKOAKrvpxgvpGKmKMzbZM=" + "vendorHash": "sha256-vIdM7SEWYnBw30wGl7wM/sMl4xtRPTUQvhqGoJxfKBg=" }, "dexidp": { "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", @@ -317,14 +316,14 @@ "repo": "terraform-provider-dhall", "rev": "v0.0.7", "spdx": "BSD-3-Clause", - "vendorHash": "sha256-e/+czUeOACwRC7xY90pZp2EWDzDpLU6Ud9RPzuNKaOY=" + "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-pu6QTKT5ikm3B12zDpWFsMbSjv8zl1oMvWtA4qtjluk=", + "hash": "sha256-wwb62tZZxpr7NXbiqcS40aF9E2msagj2Mqy4kogDsEA=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.34.1", + "rev": "v2.36.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -347,13 +346,13 @@ "vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA=" }, "dnsimple": { - "hash": "sha256-iH35dJLa/63s+CU5PdeMbqXUVGfWfpKIXH3znNUApEc=", + "hash": "sha256-aa5L1FO9Ro215zj3vH1H9k0fP2mYI5+TAvyPQumwWOM=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.4.0", + "rev": "v1.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fuIaNHlZica6PxFLzXGA+b6ODWrGWXdWYOeWzgiQRXo=" + "vendorHash": "sha256-XA6gvm4S5kwdW2uha6B5BUX5mR8HPOs3xgPgGdIc0d4=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -365,11 +364,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-FJS1lPYieTWI/AX7pBbFmGtJw5kPD7MCZp+LWWIsnus=", + "hash": "sha256-PfqFf3V+zH4SPvciLNnB9KWCVm8M94q8rzedUuXABAg=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.6.2", + "rev": "v1.7.0", "spdx": "Apache-2.0", "vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E=" }, @@ -383,20 +382,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-WWW4X5fCQAZZiAVi79realf0EtB0AGnfS5yjSJrlZTU=", + "hash": "sha256-Wtt4vkHcDBTzObfpOSdH4RAfoT/1+B58PytJ1NSkyQk=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.26.0", + "rev": "v1.34.0", "spdx": "MIT", - "vendorHash": "sha256-vMmHoQEXXPbFS/q+wy35SQd5+yEXLQFVWX9AKsmbTn4=" + "vendorHash": "sha256-9+cytMN5VK0nwLiR58lzE+UzlvqI677/rOxzd8D5k30=" }, "exoscale": { - "hash": "sha256-t1yZmayoZkDImcIr+VkNhQRzlfteGuvgcjSDOmmCF5I=", + "hash": "sha256-0PsMSEbMoeuoa17AZvzbSOoY48IeQ4CPGWknkc0tDQQ=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.56.0", + "rev": "v0.57.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -410,22 +409,22 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-trDTXsZZTSxYe8ybFYpw8FkjxWJhTjyavT21c8wN0y0=", + "hash": "sha256-jjZKwxJeimutMuz8TdNLsLigiXidtfxdsptrxSo3940=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.7.0", + "rev": "v5.7.1", "spdx": "MPL-2.0", "vendorHash": null }, "flexibleengine": { - "hash": "sha256-8wp6chQBysKEZ2088PY+h62FnTI8nIapmhQpTHO1TIQ=", + "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", "homepage": "https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine", "owner": "FlexibleEngineCloud", "repo": "terraform-provider-flexibleengine", - "rev": "v1.45.0", + "rev": "v1.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hpoeXO3RfnI49UAqtF4rmX75DXCfsl4XTjIPGFyI/Nc=" + "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortios": { "hash": "sha256-SENWlcDkb6S73yKratGSlT151wWuR43B40SoK7Hb6Qs=", @@ -435,7 +434,7 @@ "repo": "terraform-provider-fortios", "rev": "1.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" + "vendorHash": "sha256-mE25KfP2+7K7nHpkQOn1pfilm+fz5kGDDW8U+P2zglY=" }, "gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -447,42 +446,40 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-y8DMpNSySMbe7E+sGVQcQdEyulq4Wnp5ryYD7FQO/fc=", + "hash": "sha256-K3/taXnlIroiWQYyZB2LElAcF5fQm2aaEp3OXqKCJ+E=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.0.0", + "rev": "v6.2.1", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-sk18gC7ZecdvXIzYrNhyYLduttZrVVgekNjgYR379TY=", + "hash": "sha256-WquY33Dx5E+OgnAMZ6dhgwrixhHhAYRUa4l6TuzGzmw=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.8.1", + "rev": "v16.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dfsIEyLyTTJJxMPXWyo0YuSaRrjL+qGL654TAgECWPM=" + "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" }, "google": { - "hash": "sha256-mP2/XDQX/AagEmmUMDGzS6ATJpuJU21lmEvs2wFe7Tg=", + "hash": "sha256-LV3/4X/4jA+mZrkbzmYqiQDOVkH3zie2YCc6M9voJpA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", - "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.19.0", + "rev": "v5.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" + "vendorHash": "sha256-SUYBSggBAl63plYz1kf+BBL6yPKbHAG8cjJE1JquSQ4=" }, "google-beta": { - "hash": "sha256-Hx9/hGT0cqNYkn1xojeolWrvFPWhh1gsKl/qxeejBzA=", + "hash": "sha256-0eiMpPuia7M9IPhKHBWXiBXH3LenUonsbs2QdP4V1e4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", - "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.19.0", + "rev": "v5.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" + "vendorHash": "sha256-y9m+rOuQWSooeZBMuM1irx0CtdHtOqmhKv7+f8GNO6g=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -494,20 +491,20 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-FcoWovmdPUcX4LcSF9MLpxvwK1ObFejump4ha0Fmdbw=", + "hash": "sha256-7Hv0jAYnTh8B2xpxIlMdQL3mVANSRYRyG5OTHZLp4wA=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.12.2", + "rev": "v2.14.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-lbtWI96iAjHNRbhJw2e8yWSGJD7hsMqy4ZGCScSH8ME=" + "vendorHash": "sha256-NAUFTk868XhzLu5boP09JeZbMs1exqOmHkFa9MUJFns=" }, "gridscale": { - "hash": "sha256-5gidBMUfJ4DPKuRx/pF5Rlff7DPkIXBJ7qzCIy6bZm8=", + "hash": "sha256-gytjUn1xy8HTgItYrxrhm80qrbrjdDQvEcGLZ49VC+0=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.23.2", + "rev": "v1.24.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -555,7 +552,7 @@ "repo": "terraform-provider-htpasswd", "rev": "v1.0.4", "spdx": "MIT", - "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" + "vendorHash": "sha256-6jaAgyHS5H63YKnm4xcYmjKVhPbWm6KK6qHzxg/78yU=" }, "http": { "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", @@ -567,11 +564,11 @@ "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" }, "huaweicloud": { - "hash": "sha256-gNMeblhzUWa2YTvy0bmMzP0NQ3Qe0Ibec4tEKHyTHR0=", + "hash": "sha256-yYMI1UuOU/DbGYqReI//zhBmlD96KYot7h987k4Cl6o=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.62.0", + "rev": "v1.63.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -594,13 +591,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-zTrVz4SqjqbU5T/kxvhKsJnx/VPPRUvQ6CMCqiclj7M=", + "hash": "sha256-5esd44JgaarCJK38QyYv+fxMz0+zzivMZD8rqyqrdbo=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.61.0", + "rev": "v1.64.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/kbrtNvEYU0mfoe2lPaZ/b8kAfkuP/6QVzUxRry/4+I=" + "vendorHash": "sha256-YFxD7hvKTXdaQ/+/Oiws/i6TipbFaAQ0Ah1arGK7JUo=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -612,13 +609,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-0KCP5ll6TszSTP2J9+dDK6qqNcVCPgLQrdMMrfVhmds=", + "hash": "sha256-GahwviyhXcrCtM0jjJKKEwHkZTcJnVPB1JlVsJjcv+k=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.0", + "rev": "v0.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-pKWKef0MtW90HBhDVtQlETt9TqnHnfW6Ck4gXShJVF0=" + "vendorHash": "sha256-/SpaWENm6nwveUACS7hvH/Z25CTzQK/6igPhTW/fYJ8=" }, "infoblox": { "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", @@ -639,13 +636,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-EECV3JMile7Lif/GuC5330OcAGm5ylc6k43fY4jRy80=", + "hash": "sha256-bkZfgA/PgLWC3YXrIgoF2YRgOFQhoT+Seeifg1GvVFY=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.6.0", + "rev": "v0.7.1", "spdx": "MIT", - "vendorHash": "sha256-DKyDjcj7tovmlZeKjzun5YsCffTAJirp0z49kcOBq54=" + "vendorHash": "sha256-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", @@ -675,22 +672,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-CxzBTixyvsSSjZDv8GrxAB1oeRjJBB9nRAuKoASeKbI=", + "hash": "sha256-l2WPpczgKjDYxtZFqhqmJvq8CdsAIBQBeofZOn7BLzM=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.26.0", + "rev": "v2.27.0", "spdx": "MPL-2.0", "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" }, "launchdarkly": { - "hash": "sha256-rv/jgGrjJrUzGBpUnkc0n/x/msxAc/45n/JKCrGPWMA=", + "hash": "sha256-C+RGrw+XAaAekKkwvf5gtoiXghSJuByUJvyKgUt/DSE=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.18.0", + "rev": "v2.18.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-JbrecA5pNIifikBHwqFL72hRfRFHHl29mFKE4nDdbkY=" + "vendorHash": "sha256-NCyEU30hw1aWB7T8sM3lrJEUtPdWlbCGdWDaRgjeJdM=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", @@ -702,13 +699,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-ZhZ6Y8hPLL3ZxemCgDdGNC8waxNEKLMVtv3cNZtAoic=", + "hash": "sha256-BZoMNx0a+dXMpY/YaYKEL3dQonGELlNzDVtOq7Z4Yfk=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.16.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rwto/tgKfmUYCNNMZpBpZ3vHyl9I8RrgLVmPogkMYe8=" + "vendorHash": "sha256-1okvZTEycuGymzcKtUNrxZpiPVoc2ykMxMUbq8mgEOw=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -720,13 +717,13 @@ "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=" }, "local": { - "hash": "sha256-FeraMYTrcGQ7JwlCOMyOJdwhtdRHS1b5PA0lpSIwAVY=", + "hash": "sha256-va8CFAHPZvc541Bml0VPN6A5qyUiKBXRfH/3AwxgXTo=", "homepage": "https://registry.terraform.io/providers/hashicorp/local", "owner": "hashicorp", "repo": "terraform-provider-local", - "rev": "v2.4.1", + "rev": "v2.5.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-T/YQsNpPISDSVi00KrLRX/+jFNQVl2ze/3D2ZRxmUjI=" + "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { "hash": "sha256-culY1Im8D4CtgC2LtTFFB0BgrNgLfDLT0I290+0NE3A=", @@ -747,13 +744,13 @@ "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" }, "matchbox": { - "hash": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", + "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=", "homepage": "https://registry.terraform.io/providers/poseidon/matchbox", "owner": "poseidon", "repo": "terraform-provider-matchbox", - "rev": "v0.5.2", + "rev": "v0.5.4", "spdx": "Apache-2.0", - "vendorHash": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=" + "vendorHash": "sha256-L1wufPa7LPPyOPTL+jFQgiWzJoJYS+fCdw3N0KZqKtc=" }, "metal": { "hash": "sha256-1HTSDVMk2VhoYRLInrBK3bDuYU0SwyhBV1p5A2tlU/I=", @@ -765,31 +762,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-4mT5BbOXl4OY99ao6nyQQgQImPk/1X7lOAZcAxYToQw=", + "hash": "sha256-qP862jjbYks+6DR5eGzVlCvYyfupejqaxD2CgwSZxdQ=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.1.25", + "rev": "2024.4.4", "spdx": "0BSD", - "vendorHash": "sha256-eee9X1QTDqL9rIGOnnxLU6QlcSIeMLlTZnHYis+ht+w=" + "vendorHash": "sha256-r5fOj6YsW8ggoEbfyLvJDmD9P8WQ1J5K7ztg/NYm6y4=" }, "minio": { - "hash": "sha256-i3YYBffP7Jp3f0wN1ZwP+c7C8WN8EKUh7JOKzbH0R/I=", + "hash": "sha256-dgMK61jFXnOvE11FIoIJfFN1zb+N9HrFZ/WtQqwktbw=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.0.1", + "rev": "v2.2.0", "spdx": "AGPL-3.0", - "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" + "vendorHash": "sha256-Uxexx5sK6D+EEEPWLnWFE0HPG1RKUsYnSJ/1bV9JBkw=" }, "mongodbatlas": { - "hash": "sha256-6XLPk4UNZVQLpY44MIVXabmHtkoQQ58WNfhmhW+/4Ow=", + "hash": "sha256-xdPR0wyDEsyJCzRcGuDNhD4K+19KhZXsGxygoDadfvY=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.15.1", + "rev": "v1.15.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-LBgZmVuBkeKNTPIk274owej+E4Ir0xcGkL4L05PhZUg=" + "vendorHash": "sha256-1cbmarVuMIkLuEBo2+O14wHqV0hbT/Jxh0sWRvfnDoE=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -810,31 +807,31 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-4/MFR8AJanto5OuY0J3Yce3zI62D5bx2UklrTccpvP0=", + "hash": "sha256-npQn5eN3dGXy7bgVXpobn1HyVemrdxD5sASubbpY7qs=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.32.0", + "rev": "v3.34.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-QluXNbTBc/EXCO3PmnBOSwSERK3t5NhCS4Jnz5hU97k=" + "vendorHash": "sha256-Riutsej7+FISe0wFH9lGghyR5D6Jv3WbP3a33pqVBzU=" }, "nomad": { - "hash": "sha256-KHbdP5kAs65Z31Fe7EjwUVlFaezgjCqECryF/hSXXXs=", + "hash": "sha256-+S78qH7xMvJEGvgTRlxADNZI24PNgqCj1xgmIl4Oif4=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.1.1", + "rev": "v2.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-+0UAB4ZQfIyoCopQkm1hTCxDIa/J4gLDGwv4iInN4os=" + "vendorHash": "sha256-f/L9ZkirFIb+Yu2H4wz9wCb65NCC0TsmEnZPCI4Z6gw=" }, "ns1": { - "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", + "hash": "sha256-ZGqHIzK7tv7WeKHE8w11lOfDeWZqhi/88DOHcDaYHNg=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.0.10", + "rev": "v2.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-nkpKq8cAusokeuOk32n8QA9He9zQlaTFzUwLMHKzpqM=" + "vendorHash": "sha256-mOxhYVsq/yl1BqMyRWmLM/YrncMTlqiUo4GdAObH3ZU=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -856,11 +853,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-X7/v25Ges3F69LQs1SEXNLwiCkHX+/VrJ7y2XtE+2bg=", + "hash": "sha256-dGFpk83154mQlH2iM52mo+208MAU4BYBOOBH529QmRI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.31.0", + "rev": "v5.36.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -901,13 +898,13 @@ "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" }, "opentelekomcloud": { - "hash": "sha256-ZDZ5sOWpmsGc+ESWkib2gws8XOeN35WEpi9/R2262yg=", + "hash": "sha256-wRKwrxZbT2z71gVE+O8bLjZmRGsZDhdn4raShedV4kc=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.2", + "rev": "v1.36.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-2gZ3+XK5FF4hQ2zGjULrPj3QYrCG9MNFLdcVdxgzX9s=" + "vendorHash": "sha256-Xlba/lceTt1DPtHZxeIQqbscl+pZl7hw6xJXleXd0r0=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", @@ -919,20 +916,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-jQ+eitK5kX12yso+cSltZWRPc/3P2v4W4H2+TbPKvNI=", + "hash": "sha256-SGezO0L/rt5rnIz3LijkKdXn0+EPlmM/rGQ/aB2GES4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.37.0", + "rev": "v0.40.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-WjRfkMMgGuqSpJd4514heDQD4SaiH7gIkZwJzzqxoZk=", + "hash": "sha256-joR7uucMEBbQIuec29m+t3w5W/omgzexg70+Sh2MeBY=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.9.0", + "rev": "v3.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -973,13 +970,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-ZE3OW83tz2DfcwFn8KfZZYQuWdl335zJecC3Qzn0xPg=", + "hash": "sha256-U3hm1BqqePffuLBg+U4hgzcZpk+VCLhE5GsnRRYKT30=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.4.0", + "rev": "v1.5.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-i7wota4ezfBA2AoSGO8OdbJcZQizXrPRJYE/WJSTFss=" + "vendorHash": "sha256-2gVJpNRIEO/mTBg3m5CoxpeC2U09hnV9bPi5537f1Mk=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1000,13 +997,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-k4lJszOUxeOmpBX8wFiIg6MmVUWqH6OTuj0/OJgr0ZA=", + "hash": "sha256-w9oAeE8KuD7kdBFOkNgifaELrxr3X1yKYXFiQLyaGY8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-8XBsQuzEtg8nybJOFHkkr4nfp4WxnmgXqt0ci7q0CbI=" + "vendorHash": "sha256-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" }, "random": { "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", @@ -1036,13 +1033,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-ygCr2kxnVoR2IvtvQI483Urd5sLU6U+TCHYW1FXy1Tc=", + "hash": "sha256-TRmBSATsynbvRg9TC6kYPbzV3Y2X9Kr/3FjyMe7Kj6c=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.37.0", + "rev": "v2.38.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-JXSXDJqRGZDk1xyyWhv+S9Jl5duBN9RR71eukDc6ODQ=" + "vendorHash": "sha256-hUueCEaNuTQFD17eyne7LMUr5dXdycLFJ7/d9AJh3F4=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1054,13 +1051,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-p9XH9/sIVyY2f957/8KI91y5GCn1/MEGY+QBsArvYJA=", + "hash": "sha256-HgHgZEo6fKxunbE5W8LUVukvmGpEc0bqbpO/ZcdwmTE=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v4.0.2", + "rev": "v4.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-FjJosTjFRJnBW22IB9UHfZe9KWrT1h12InyUl0q7a28=" + "vendorHash": "sha256-VT9A7x7CAKJjuCXLI42s6WDy/XSME0UYLU6k1YcreU0=" }, "sentry": { "hash": "sha256-sUXOH0cbD5Zf3e4KHLUYM8vu2knJdfIWZ+fq9HMfJ54=", @@ -1108,11 +1105,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-ZPqKctqmAaF7obRDdK2Jn5kGihjyPZhl8IoAprcXuUI=", + "hash": "sha256-X0VD4aI7WzNsy36e39eWzn2IIaLuXnhFSgiMnbb4myU=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.87.0", + "rev": "v0.87.2", "spdx": "MIT", "vendorHash": "sha256-hvaZBOeAVutoKv46BLE1ud1Ox0K0InpTSG5G2WwTj5s=" }, @@ -1126,13 +1123,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-9hSrU4pSlbcGM0HHKg/xIPz4DTvds6+yIFYbQ+xmPrA=", + "hash": "sha256-frnDZx02Kmp2C0djkZYfeZ6WsGc9mFUNmpajsfx8FCI=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.162.0", + "rev": "v1.168.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-lOLX/ZcBbh7TzsKO9w/dB1gm0KD9ezlXNjWRBBQVgsQ=" + "vendorHash": "sha256-pf9FsI11CKANee0dM0djLVF1xwztKVlb0bVAkp/6zbc=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1162,22 +1159,22 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-fO7EsELdBElvosfbyKYnun7pJhoy5tTADGgYHqi9nEQ=", + "hash": "sha256-wGqOUeDJs80s5xNsnJ4uLg6DXxcZA+P30XtY4DyCDzo=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.28.2", + "rev": "v2.28.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" + "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" }, "tailscale": { - "hash": "sha256-1OSGJham+oJLQUcSm+Iea9SDM5VhOcE7Bz+ZgxM4Lww=", + "hash": "sha256-hvhdaxO7CbsfFzDw0UuRxlgRwvumWPz/I65IgounflQ=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.13.13", + "rev": "v0.15.0", "spdx": "MIT", - "vendorHash": "sha256-w0S9ACnDNZsEvYEkS2Q/8I2doM3AmgpzmgRXgA7CaTw=" + "vendorHash": "sha256-+XgYutJTSKL6HmAX4GLnktqcM3AxYP7B1UHzAp/Oz78=" }, "talos": { "hash": "sha256-DoO2aGoBkuafPJGNz0opmkFw4wwUgsczA2D0bSXQAlg=", @@ -1189,31 +1186,31 @@ "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" }, "temporalcloud": { - "hash": "sha256-ROFjDIzMLifFZAfetpDWOGylyg9Jp6vN9dEDLMZ3tz8=", + "hash": "sha256-pjxEcA8K9n70FWMwpTXr8fwOCj/GVmiL9XfKLRLQ6tI=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.5", + "rev": "v0.0.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-9sIVFZJXFR0+cJj6xL6bXRTY9dKIB6a+7ZCopeq9upM=" + "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" }, "tencentcloud": { - "hash": "sha256-vcq7DvYv4dHd7nO4iwCWePuPwM2mIMfC438FkpG/Iwo=", + "hash": "sha256-nYQVrWpCiDTXJ6BA9dwXkslGF/dvlT+E8WBD7By91Cw=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.77", + "rev": "v1.81.86", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-/YEDeDH+6J1p/p0myonruRx4BiYao2zy40kMMb+Jv6o=", + "hash": "sha256-5Txgqf/4dh2fsB6guqgLs3PxZs1QB32NzqCFIwM4ogg=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.52.0", + "rev": "v0.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kDR4CB3RAvGC/NkT4PJ7BxI2v8WSfI2mfGSW+d1J2ZI=" + "vendorHash": "sha256-7rMBmB93dLPyd9VcVc9R8SnXQ0XkU6SHc6j/KiAODVg=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", @@ -1225,13 +1222,13 @@ "vendorHash": null }, "time": { - "hash": "sha256-5AOp6y/Nmu59uB9QXqwkcgakyzAyiAclZ9EJa7+MvpY=", + "hash": "sha256-yRYGyDPMR/2+OOjqXj1OhpvYoAUEbgWPcW4PcatPPh8=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.10.0", + "rev": "v0.11.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-TrkmjqUJi28sN9POzEuKzKyPQiS1RtVpj9NbsM3jW0I=" + "vendorHash": "sha256-UZ0DpurmLmju/MG0uhAXgbwQoas94/R9TNT1cyO6pIQ=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", @@ -1262,40 +1259,40 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-OFnNEmODAluhEzVvQ22jblUhpzIlIvjsYZZmtepAcX8=", + "hash": "sha256-u9LxsBKmS80h4y+/nJZ+0+cmQP5gS/I+T5g8H/QlPDA=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.6", + "rev": "v1.38.8", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-DW2O1tou+HfOgzSca/SS3tFeo0efGt1ATVs5SmwUvmk=", + "hash": "sha256-LGjH/nQj18v8qjwJEU1CkrauGqSizsTpl80Q5jNIwUE=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.18.0", + "rev": "1.19.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-srhu8iepW/JmPrJ7PuXyk0GEWMwzpNpkny33z7ZdrdM=" + "vendorHash": "sha256-QC5EWVSkBDMfLR2f0u0K2LOn6FaHCeFkNJeq8vWQp+o=" }, "vault": { - "hash": "sha256-hxEy9S6BH4pjHzmGu7LMFuV/dXc9oJ4PKLX4TYlxAJo=", + "hash": "sha256-Pdh2rudUwOgY292JPPrvxIABHC+/dBYK5iNTaHZ9ed0=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v3.25.0", + "rev": "v4.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cKD8+YiclFNR9xWr68F17mQjtxhAsPBpXhT6luvXp3I=" + "vendorHash": "sha256-b/1g/1hFbIfzYJ0lQKNzalLkD95LLRgoftuoeDicalE=" }, "vcd": { - "hash": "sha256-TP9COMofx4c2GZ0dQkfopn4iq8ddfV3WwuNjTu6yQnU=", + "hash": "sha256-yywk60Ae1Ch+kuOqoKfAqrOhUAbJVQxA0wJW+CfZ4CY=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.11.0", + "rev": "v3.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-IqmmlLr+bwfSRJtKbK/fiBdbf2vX61+6h6rZizD1vw8=" + "vendorHash": "sha256-53Cj5ooDsg91iiuYzjAt9u9S40g6plcz6lqlnawNFNM=" }, "venafi": { "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", @@ -1325,22 +1322,22 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-dvdsfUKhl1z/iHsh+/2HDb6mEX86P9FgynkzVQgtM5w=", + "hash": "sha256-v/0LBzyUUqt+Jx4GubCC2QzKdgt5WrrjZ4YvfxA2+GA=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.12", + "rev": "v3.0.13", "spdx": "MPL-2.0", "vendorHash": null }, "vsphere": { - "hash": "sha256-VWPKSR6xIph5dnMBSmLB/laY+DmNdshn6+94amCFQ5g=", + "hash": "sha256-SATX9BO6tnHW8+oeSeMNP3+opKHBk42va2J8YdrnlUw=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.6.1", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-d9CdK5AHFZRC89Xko4vyx8jR10fkG1VYGVILlXM7zgw=" + "vendorHash": "sha256-cHzIOIGy5DT5q5fvQlv56V6/vU0akBFM34M+c2+qIy4=" }, "vultr": { "hash": "sha256-+J4RHQWOy4Wfv2/8UNHe8g2fp2yAxzqzZZRv749B3Yc=", @@ -1361,11 +1358,11 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-utRegZYS19yjd1Gnqnet+XKaLop81JrNO+Oq7Gzms1M=", + "hash": "sha256-mlai++RjiYFSJLkhyWyKKYs/LFVoKIHtFB2bGmB5DFM=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.110.0", + "rev": "v0.112.0", "spdx": "MPL-2.0", "vendorHash": "sha256-eE8gYyIGVBmw02I6j9GoEm2TiOmHGWhOs5pcqj/6PaA=" } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 94b7fe50c5a94..f9e1dff0a8f7b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -31,7 +31,7 @@ let postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace "/bin/stty" "${coreutils}/bin/stty" + --replace-fail "/bin/stty" "${coreutils}/bin/stty" ''; nativeBuildInputs = [ installShellFiles ]; @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.7.5"; - hash = "sha256-k/ugXlHK7lEKfOpSBXQNUdcq26rVVdjo53U+7ChJLIc="; - vendorHash = "sha256-5sCf65gFpI3y+qwDYvD08OZHNsDMg2IuDL65NMsLQ4Y="; + version = "1.8.1"; + hash = "sha256-q/r1KK0svdK/5Za4bqU6bGgTcWmG+YZFJUFRKqPAWSw="; + vendorHash = "sha256-xpgGceAA+kvwUp4T0m9rnbPoZ3uJHU2KIRsrcGr8dRo="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 5ed3b0e07a077..a2f8fd2fbaa1b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.55.15"; + version = "0.56.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-luVYnuvsLHfkSZVCjzGB34ffbNzuKjEFmxQfgdY+YpQ="; + hash = "sha256-aKgcXLxFZBoomrKJFmUr/XfxHmNrkvK2IlfTR2dJNY0="; }; - vendorHash = "sha256-KXAN8WNKFfGbV7YQRhwgFBM0g+rbHe+MIuaR5/7khAs="; + vendorHash = "sha256-joEmkFtoVxqlVrgl2mtJN9Cyr3YdnT6tBjaSXj9z2WU="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/applications/networking/cluster/tf-summarize/default.nix index 14fec4795db0c..09c6ee5ae0d74 100644 --- a/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-rMpCNFuWgllvpi9PLyXAaV5IRphmPEI8HjBxKWgOydg="; + hash = "sha256-OmGJgy36Jv7/kyGg2y1cNS1r6n1C/plfC0s6q08Wox4="; }; vendorHash = "sha256-nfontEgMj2qPbrM35iR7b65qrkWHCMY1v944iYdNLG8="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 50079dc762d8f..1350ff921a2c5 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1308"; + version = "1.0.2"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-EyA7LwfL3vCNzd2wpyUbrUnvkM0/f7/cQp+jcAcGZsg="; + sha256 = "sha256-Gp7+TEE7rmlabZhley/crpYZiqiKcc6uqSr6leZsmgU="; }; - vendorHash = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; + vendorHash = "sha256-DsC9djgt7Er2m2TacUldpJP43jC0IBklPnu41Saf4DY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 3a9d657dbdd2b..e36e12a3b4ff0 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -1,27 +1,33 @@ { lib -, buildPythonApplication -, fetchPypi +, fetchFromGitHub , makeWrapper -, poetry-core -, posthog -, pyperclip -, requests -, rich -, textual +, python3 , enableUsageTracking ? false }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "tftui"; - version = "0.12.4"; + version = "0.13.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-E4Y0qA7SooMlHh+oSFUl1hfblpirr/Jdb1C2fqU43t0="; + src = fetchFromGitHub { + owner = "idoavrah"; + repo = "terraform-tui"; + rev = "refs/tags/v${version}"; + hash = "sha256-2Kya0MRa1kc3B5nqs2MNprtnjOGyMLQh2OSErdT5W8M="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "textual" + ]; + + nativeBuildInputs = with python3.pkgs; [ + makeWrapper + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ posthog pyperclip requests @@ -29,11 +35,6 @@ buildPythonApplication rec { textual ]; - nativeBuildInputs = [ - makeWrapper - poetry-core - ]; - pythonImportsCheck = [ "tftui" ]; @@ -46,7 +47,7 @@ buildPythonApplication rec { meta = with lib; { description = "Textual UI to view and interact with Terraform state"; homepage = "https://github.com/idoavrah/terraform-tui"; - changelog = "https://github.com/idoavrah/terraform-tui/releases"; + changelog = "https://github.com/idoavrah/terraform-tui/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; teams.bitnomial.members; mainProgram = "tftui"; diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/applications/networking/cluster/tfupdate/default.nix index e7a4250f94445..25a547402104c 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.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-WVYWoojNRAKmFt5kTaE86TNgodTld/vZ4O2LmLcU6sA="; + sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; }; - vendorHash = "sha256-BjusVkp7gN/w2uC1ZyUDaqvXvjEN6BVYNcwNZFOLjDc="; + vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0="; # 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 6bc70de3213f7..8fafcf666d8d2 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -2,7 +2,7 @@ , stdenvNoCC , version, src , fetchYarnDeps -, prefetch-yarn-deps, yarn, nodejs +, fixup-yarn-lock, yarn, nodejs }: stdenvNoCC.mkDerivation rec { @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { inherit src version; - nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ]; + nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/web/yarn.lock"; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 023bc2110e151..f475ba4fbd0c5 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,27 +2,27 @@ buildGoModule rec { pname = "vcluster"; - version = "0.19.1"; + version = "0.19.5"; src = fetchFromGitHub { owner = "loft-sh"; - repo = pname; + repo = "vcluster"; rev = "v${version}"; - hash = "sha256-W9BSLGUrW8Us+yYQLIz3oY8JKJSo43cL+oWQQf3xWJE="; + hash = "sha256-V+Y2LekBYlKZU53BsYCW6ADSMJOxkwSK9hbFGXBaa9o="; }; vendorHash = null; subPackages = [ "cmd/vclusterctl" ]; - nativeBuildInputs = [ installShellFiles ]; - 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; @@ -45,12 +45,13 @@ buildGoModule rec { command = "vcluster --version"; }; - meta = with lib; { + meta = { + changelog = "https://github.com/loft-sh/vcluster/releases/tag/v${version}"; description = "Create fully functional virtual Kubernetes clusters"; - mainProgram = "vcluster"; downloadPage = "https://github.com/loft-sh/vcluster"; homepage = "https://www.vcluster.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ peterromfeldhk berryp qjoly ]; + license = lib.licenses.asl20; + mainProgram = "vcluster"; + maintainers = with lib.maintainers; [ berryp peterromfeldhk qjoly superherointj ]; }; } diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 4cb8bc0ad40df..8a39c31f11d9e 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-Fz3FqNj2NbqU9CvtdjM8cjkZh5xLCA+AAIF/QgLJ7UA="; + sha256 = "sha256-Dqz8UFoGb5uG5f8mrIUIRWJUYH/ZuFavhRy2wie75/Q="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-Fu4T2VEW5s/KCdgJLk3bf0wIUhKULK6QuNEmL99MUCI="; + vendorHash = "sha256-L1QTqw0L/aE4bFlLWg4/mmdHL7Sb5EsT3eL0jZIpBsA="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix index 65b6d780ffb29..94aba4b3b5672 100644 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ b/pkgs/applications/networking/cluster/waagent/default.nix @@ -14,12 +14,12 @@ let in python.pkgs.buildPythonApplication rec { pname = "waagent"; - version = "2.9.1.1"; + version = "2.10.0.8"; src = fetchFromGitHub { owner = "Azure"; repo = "WALinuxAgent"; rev = "refs/tags/v${version}"; - sha256 = "sha256-lnCDGUhAPNP8RNfDi+oUTEJ4x3ln6COqTrgk9rZWWEM="; + sha256 = "sha256-Ilm29z+BJToVxdJTUAZO3Lr2DyOIvK6GW79GxAmfeM4="; }; patches = [ # Suppress the following error when waagent tries to configure sshd: diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 85b97faabd3d6..0a33c8f689a57 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.296"; + version = "1.2.307"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-D0bWva6Y0x9uMdKMONsiGC3SV2ktGPzfMq9BELqgk3E="; + hash = "sha256-jT0QZIMHFhhMIhBj2kliRP0/B8BLYGZdojZ7THXnUmg="; }; - vendorHash = "sha256-6q13vMxu0iQgaXS+Z6V0jjSIhxMscw6sLANzK07gAlI="; + vendorHash = "sha256-2ZRyRgW42W/z6G5DfSMqbdXnW5TNcMdz385Dt7PWj6k="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index a19cfa5bee584..b8436f611c355 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.32.5"; + version = "0.33.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-uItOFBvxre7GHgASfTILkFkGddzISNciIpyQhsnyQGY="; + hash = "sha256-r/PRLOqzXANYWAq3hdLKWxw1WXJzgVjIenHky2+WXj4="; }; - vendorHash = "sha256-ZwcyUteDgR9mNVE3UVqHwHzE0bkxE3voxk3b3Ie4Els="; + vendorHash = "sha256-6DGkDHBoUj5Zk0KI3HVb+trkzWzB4+8nOh1ijE9PrEk="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 69b4a0dcc16c0..c1ad822138ab7 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Fdc8U5dN31mfeucmYdi3R+EM5wPvm/i3O1ib3Y30Qng="; + hash = "sha256-G3Ovu/tF7gCeddmE91nht/yyqJJtgMyIi7YbTtUFyKo="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-oJ/oz3PtkzEwZw93eoZV2hoD1uOWg2qdxgsvM+nX7mk="; + vendorHash = "sha256-IJFRtoDd0GO8mIx8mmGixaYK5JDQeSpUfk0MPPX6cX8="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index e6cccf088e464..9094459fe7440 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.36.0"; + version = "1.37.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-bbHJilMh7qnGvYuid8/PmIg5m42jddqOOuMd7mzQmCo="; + hash = "sha256-gbbNeG0WzXiPE20XPtg4x57kvcNuHsxN57aLK+OUpv8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-Er9m8G020SKEN8jMIhEYiKvF27YY4dZvG0noYaH3bPU="; + vendorHash = "sha256-c5kq5vql3KSv8gkm4Wrp1llUhUOWZuuhkzNXDYrgUhw="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 703b6c7456fa0..6afe93fee4712 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-6XMw8fnuM1KyInYCw8DTonsj5gV9d+EuYfO5ggZ3YUU="; + sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-So7XBC66y2SKbcjErg4Tnd/NcEpX5zYOEr60RvU9OOU="; + cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index fc2c33e292cfe..dd1084b0dd808 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.8.2"; + version = "4.9.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-9myo073/yl9CWwmVb3Gkihf6I/60kSOl0Pk8+dE39KM="; + hash = "sha256-E5/7qAK2pvl1ADioF7Iwe9SgCE6tVaQdtOAwNo3XZx8="; }; - vendorHash = "sha256-jOLFqCeBxQLXgUAdDbk/QnPBAtMBQi5VR+oKjgZLb28="; + vendorHash = "sha256-5VTC6Y3Bs2ViW5/O8TeD0i6Boeu71b9C+B/3O73bCbk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index c522210bb6e70..bd89a2a0a329c 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.34"; + version = "2.35"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-knF+N/HHL/E6C973t+ww5XTLV2thwy7lMAeqTyXspHY="; + hash = "sha256-WbicKP46N8MVjUeerYUdcHJO5Qf7rQFyYCpxexd2wDY="; }; - cargoHash = "sha256-IsDym+tqF040SxCJF575OPm45IROYMFsCrxJcM1SAJ4="; + cargoHash = "sha256-B6U+DxIRm9Sn4x+dZCfNKENNDsTUVZFT6i0Yz47gjTs="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index b9e903c236a54..3feabb49602dd 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -1,4 +1,9 @@ -{ pythonPackages, fetchurl, lib, nixosTests }: +{ lib +, pythonPackages +, fetchPypi +, fetchpatch2 +, nixosTests +}: with pythonPackages; @@ -9,11 +14,19 @@ buildPythonApplication rec { propagatedBuildInputs = [ feedparser html2text ]; nativeCheckInputs = [ beautifulsoup4 ]; - src = fetchurl { - url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g="; + src = fetchPypi { + inherit pname version; + hash = "sha256-RwORS2PHquxBZLNKqCJtR5XX4SHqPCb/Fn+Y68dfI/g="; }; + patches = [ + (fetchpatch2 { + name = "html2text-2024.2.25-compat.patch"; + url = "https://github.com/rss2email/rss2email/commit/b5c0e78006c2db6929b5ff50e8529de58a00412a.patch"; + hash = "sha256-edmsi3I0acx5iF9xoAS9deSexqW2UtWZR/L7CgeZs/M="; + }) + ]; + outputs = [ "out" "man" "doc" ]; postPatch = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 3bc1768654fab..e17fd5d6916eb 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.24"; + version = "3.11.27"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-GivnZ7WWoS4fc7/uUfZFTdT0W+pW7W6Vhb56CmkEb0k="; + hash = "sha256-0ENBUOH+/pe4OsVQ6cu1xLTPPHtUMNARQGVyxOk60X0="; }; postPatch = '' @@ -22,12 +22,12 @@ python3.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { loguru more-itertools packaging - pendulum_3 + pendulum psutil pynzb pyrsistent diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 23dfae71080a5..351fafc136ff2 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.66.5"; + version = "3.67.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz"; - hash = "sha256-khIoGbrmNBBwuktuy0V+ZzC0bn3ImUKZCQPymJA9Gzs="; + hash = "sha256-5drcgH25mc60ZJhPl00+9ZtWLFlUZlgFfpsgEYOtr5o="; }; configureFlags = [ diff --git a/pkgs/applications/networking/gabutdm/default.nix b/pkgs/applications/networking/gabutdm/default.nix index 6fbe0222112c4..cb587ea7f093f 100644 --- a/pkgs/applications/networking/gabutdm/default.nix +++ b/pkgs/applications/networking/gabutdm/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , meson , pkg-config -, cmake , ninja , vala , wrapGAppsHook4 @@ -15,6 +14,7 @@ , json-glib , qrencode , curl +, aria2 }: stdenv.mkDerivation rec { @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config - cmake ninja vala wrapGAppsHook4 @@ -53,6 +52,12 @@ stdenv.mkDerivation rec { --replace gtk-update-icon-cache gtk4-update-icon-cache ''; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ aria2 ]} + ) + ''; + meta = with lib; { description = "Simple and fast download manager"; homepage = "https://github.com/gabutakut/gabutdm"; diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index d61eff36081b2..413b1f3b3dafa 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -8,7 +8,7 @@ , gettext , desktop-file-utils , appstream-glib -, wrapGAppsHook +, wrapGAppsHook4 , python3 # Not native , gst_all_1 @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { gettext desktop-file-utils appstream-glib - wrapGAppsHook + wrapGAppsHook4 python3 ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index ae792037e453a..f9939000f7440 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication { checkInputs = with python3.pkgs; [ pytest-aiohttp pytest-rerunfailures - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) ]; pytestFlagsArray = [ diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 1ea7541495545..5789e29263fc5 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -5,12 +5,12 @@ , llvm , pkg-config , makeWrapper +, elfutils , file , hyperscan , jansson , libbpf , libcap_ng -, libelf , libevent , libmaxminddb , libnet @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8="; + hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc="; }; nativeBuildInputs = [ @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { ; buildInputs = [ + elfutils jansson libbpf libcap_ng - libelf libevent libmagic libmaxminddb diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 7101bba8d1967..f28334ffa3c0a 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.14"; + version = "0.2.1"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-Amp6PkQWd4PnwUL29fzGETLuQXVEaARr+jIRlfrxTKc="; + hash = "sha256-FPhHy+4BmaoGrHGsc5o79Au9JcH5C+iWTYQYwnTLaUY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index f2c7d287d01e5..63d6720aaf0db 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.99.23"; + version = "3.103.36"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.23-build-240309svrjfqia1-x86_64.AppImage"; - hash = "sha256-8kZk5tEJCcSPKgpsVKrHB5twujZF2LdepW7HIJsb52E="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.103.36-build-240411hw9xbpc7s-x86_64.AppImage"; + hash = "sha256-qxu/a8eeWeOKCsno51J2IHUXTXH82KXBNajfoEkkid8="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 73d1321850159..ac3c751ed5cb2 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -7,6 +7,7 @@ let homepage = "https://sindresorhus.com/caprine"; license = licenses.mit; maintainers = with maintainers; [ ShamrockLee ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 19c91baf9a43e..5e61fc78091e6 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qt6, boost, openssl, libsecret }: stdenv.mkDerivation rec { pname = "chatterino2"; @@ -10,8 +10,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ]; + nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; + buildInputs = [ + qt6.qtbase + qt6.qtsvg + qt6.qtimageformats + qt6.qttools + qt6.qt5compat + boost + openssl + libsecret + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; + cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" @@ -32,6 +44,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ rexim ]; + maintainers = with maintainers; [ rexim supa ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 11ac39c32f804..adacea2d019a8 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -15,6 +15,7 @@ , gnome-desktop , gspell , gtk4 +, gst_all_1 , json-glib , libgcrypt , libadwaita @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { repo = "Chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-5IkQnXAKl0duy/B6+z7PXYv5zxakxJCgQhWBw5wioWg="; + hash = "sha256-7SdoN9JjGwELOdISJwS1Afcydp/rE2uq/tHO/UrFKNU="; }; nativeBuildInputs = [ @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { gnome-desktop gspell gtk4 + gst_all_1.gstreamer json-glib libgcrypt libadwaita diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 9777dca11c59f..841df5a4cd610 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv +, darwin , fetchFromGitHub +, rust , rustPlatform +, cargo-tauri , cinny , copyDesktopItems , wrapGAppsHook @@ -16,6 +20,7 @@ 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.1.0"; src = fetchFromGitHub { @@ -37,33 +42,48 @@ rustPlatform.buildRustPackage rec { in '' substituteInPlace tauri.conf.json \ --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' - + substituteInPlace tauri.conf.json \ + --replace '"cd cinny && npm run build"' '""' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; - postInstall = '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + cargo tauri build --bundles app --target "${rust.envVars.rustHostPlatform}" + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications/" + cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" + ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" ''; nativeBuildInputs = [ copyDesktopItems wrapGAppsHook pkg-config + cargo-tauri ]; buildInputs = [ openssl dbus glib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libayatana-appindicator webkitgtk + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.DarwinTools + darwin.apple_sdk.frameworks.WebKit ]; - desktopItems = [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "cinny"; exec = "cinny"; @@ -77,9 +97,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = [ ]; + maintainers = with maintainers; [ qyriad ]; license = licenses.agpl3Only; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "cinny"; }; } diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 258f75df4d108..19e84a5f30794 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , buildPackages -, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext +, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita , libnotify, libsoup, libgee @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { cmake ninja # https://github.com/dino/dino/issues/230 pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext gobject-introspection ]; diff --git a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix index bdbd550b6731b..aa3bb8277227f 100644 --- a/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord-screenaudio/default.nix @@ -8,18 +8,19 @@ , qtwebengine , qtwayland , pipewire +, kdePackages , nix-update-script }: stdenv.mkDerivation rec { pname = "discord-screenaudio"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "maltejur"; repo = "discord-screenaudio"; rev = "v${version}"; - hash = "sha256-it7JSmiDz3k1j+qEZrrNhyAuoixiQuiEbXac7lbJmko="; + hash = "sha256-+F+XRBQn4AVDVARdM2XtBDE7c6tMPZTR3cntDL8aenw="; fetchSubmodules = true; }; @@ -34,6 +35,9 @@ stdenv.mkDerivation rec { qtwebengine qtwayland pipewire + kdePackages.knotifications + kdePackages.kxmlgui + kdePackages.kglobalaccel ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2537ad9163857..7211d540896b4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,57 +2,57 @@ let versions = if stdenv.isLinux then { - stable = "0.0.45"; - ptb = "0.0.74"; - canary = "0.0.300"; - development = "0.0.14"; + stable = "0.0.50"; + ptb = "0.0.80"; + canary = "0.0.357"; + development = "0.0.17"; } else { - stable = "0.0.296"; - ptb = "0.0.102"; - canary = "0.0.435"; - development = "0.0.31"; + stable = "0.0.301"; + ptb = "0.0.109"; + canary = "0.0.477"; + development = "0.0.39"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-dSDc5EyWk/aH5JFG6WYfJqnb0Y2/b46YcdNB2Z9wRn0="; + hash = "sha256-6VXdVLk7Z8NGQMiSdgBRd8NIueUktkId6BXYKNABb+4="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-I466kZg4FE6oPem7wxR6Snd8V3nFF5hH70zlGTCcsZk="; + hash = "sha256-y/ntnHIYcY35Jszh0PrFy395eJ5dBWwLNpzHMoSZuNA="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-GmPnc13LBBsMgTiUkOstL1u0l29NGUUQBQKTlXcJWsE="; + hash = "sha256-sDwC5kPzAfvQmsrq6M/GPFtUaT9pNAEB4uGI5Mn3oXs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-QR71x+AUT2s/f8QBSJwSDqmqDRQBu3kUxAiXgfOsdOE="; + hash = "sha256-AmbaMVi/or+9QLuQO5u5btgKeKdrfo7bzZgGLILwgqo="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-0bSyL/J2P1pVzv9pFTNSR3V2NkQcDTd74t8KT+WVd64="; + hash = "sha256-h7C1wCKtUGcMFUhoKVdD7Vq9TGUaXfmjlVhwmRdhqYw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-33x6M++EsRJXTbsC4BCa21Yz7cbAhsosPO1WqYq/lCY="; + hash = "sha256-xxLnzELuI0X2r/weP1K2Bb51uRh1JjR72p7cXzy12Kc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-Jreet8EstaTAYAmQrzRaJE/b+xwgRVXIW8elEY7amvw="; + hash = "sha256-xEDtEtZNhOTtz+zRLLQBSeLbntlVAVQsocAGyAaVePM="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-He/9KH1oMyj9ofYSwHhdqm7jKDsvrGpPPjLED9fSq30="; + hash = "sha256-nZV9LK3eGpXK/2wQKJBn3K2Ud6uBk8aammkeE00rWx0="; }; }; aarch64-darwin = x86_64-darwin; }; - src = srcs.${stdenv.hostPlatform.system}.${branch}; + src = srcs.${stdenv.hostPlatform.system}.${branch} or (throw "${stdenv.hostPlatform.system} not supported on ${branch}"); meta = with lib; { description = "All-in-one cross-platform voice and text chat for gamers"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index ffbee0f25f828..db8a8be7a8718 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeWrapper , makeDesktopItem -, prefetch-yarn-deps +, fixup-yarn-lock , yarn , nodejs , fetchYarnDeps @@ -16,7 +16,6 @@ , AppKit , CoreServices , desktopToDarwinBundle -, libnotify , useKeytar ? true }: @@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs makeWrapper jq ] + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; @@ -79,11 +78,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { ''; installPhase = - let - libPath = lib.makeLibraryPath [ - libnotify - ]; - in '' runHook preInstall @@ -111,7 +105,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --set LD_LIBRARY_PATH "${libPath}" \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 343c21d64730c..2d69022ec35df 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -6,7 +6,7 @@ , writeText , jq , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , jitsi-meet }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = webYarnHash; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps jq nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ]; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 8cb54de82410a..b7c9de0cc7323 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.60"; + "version" = "1.11.64"; "hashes" = { - "desktopSrcHash" = "sha256-r4Kcf8iBACHSiUceHq5T2BswGqgVkMBm/5ANq0smA20="; - "desktopYarnHash" = "16psxfai8dyckm4xwrg5czv6l4163x2nlqqcdgly6axabllgacj1"; - "webSrcHash" = "sha256-k+jtTUuLaux2HSDsLT2ktcShQTNNnDe0e3Icoa31WdE="; - "webYarnHash" = "0rgdfdkri7mxs7rvp3rwbnijbcs5chc02smw1kbb00j6qzf6k3dj"; + "desktopSrcHash" = "sha256-U6vVuc7claPZI4idZmTXpm1GHm+VrmoaJNVgJU0GHMU="; + "desktopYarnHash" = "079jg178cq2m91fhzrdab8x33wrm5a97ga19g0268q118vbnv98l"; + "webSrcHash" = "sha256-jphxYlSxHjck6XA3JXofC6AbVb+aVOjsbxLUqo1hRhY="; + "webYarnHash" = "0q91llgx8cy6zxinfqbnrcfkmclqx7czlp08f1ls43x0w2vd8447"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 980e22c0c3e30..ed6b5ebe72a65 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, prefetch-yarn-deps, CoreServices, fetchYarnDeps, removeReferencesTo }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs, python3, yarn, fixup-yarn-lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; - nativeBuildInputs = [ nodejs python3 yarn prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; npm_config_nodedir = nodejs; diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 602df7626f0e0..8900f26d90a45 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -63,13 +63,13 @@ }: stdenv.mkDerivation rec { - version = "6.9.16"; + version = "6.9.20"; pname = "feishu"; - packageHash = "fe01b99b"; # A hash value used in the download url + packageHash = "6085d1c4"; # A hash value used in the download url src = fetchurl { url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; - hash = "sha256-+koH6/K0J8KCVaNGIVvmLmPn/Ttyc9WcNAp0f7PLkqg="; + hash = "sha256-kg5j/vWaCBUjnF983kk0ZMJ+inF5z5ctED9+ITuIn94="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index a2fe31c1099de..294564dc952f9 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -1,4 +1,4 @@ -{ lib, mkFranzDerivation, fetchurl, xorg, nix-update-script, stdenv }: +{ lib, mkFranzDerivation, fetchurl, xorg, stdenv }: let arch = { @@ -6,13 +6,14 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-ERAMFb69Y2kWiHIBn4ITEZJlx+YIpzqDye80vchOXl0="; - arm64-linux_hash = "sha256-B3zlhxJQaDoZ69nu/dXUbY2qxJ6FAp4CqU8+TLoNwsg="; + amd64-linux_hash = "sha256-RH8iHqJ0Nd3wkXmv/ZGX5JeWtxyJtVLVb0tz6tnkjrw="; + arm64-linux_hash = "sha256-0gvkabuxRqkMeyZiOSyT6C7v767+uCrsXE8qk0y0mYM="; }."${arch}-linux_hash"; -in mkFranzDerivation rec { +in +mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.7.1"; + version = "6.7.2"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock index 71697cfc7df28..3c5de8c878377 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock @@ -19,15 +19,6 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aead" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" @@ -38,40 +29,27 @@ dependencies = [ [[package]] name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "ctr 0.8.0", - "opaque-debug", -] - -[[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", + "cipher", "cpufeatures", "zeroize", ] [[package]] name = "aes-gcm" -version = "0.9.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "cipher 0.3.0", - "ctr 0.7.0", - "ghash 0.4.4", + "aead", + "aes", + "cipher", + "ctr", + "ghash", "subtle", ] @@ -81,20 +59,20 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ - "aead 0.5.2", - "aes 0.8.3", - "cipher 0.4.4", - "ctr 0.9.2", - "polyval 0.6.1", + "aead", + "aes", + "cipher", + "ctr", + "polyval", "subtle", "zeroize", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" dependencies = [ "cfg-if", "getrandom", @@ -150,9 +128,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -164,9 +142,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -198,15 +176,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arboard" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" dependencies = [ "clipboard-win", "core-graphics", @@ -217,7 +195,7 @@ dependencies = [ "objc_id", "parking_lot 0.12.1", "thiserror", - "winapi", + "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb", ] @@ -246,13 +224,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -263,11 +241,11 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "slab", ] @@ -305,18 +283,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.5.0", + "rustix 0.38.31", "slab", "tracing", "windows-sys 0.52.0", @@ -333,12 +311,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -355,7 +333,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -367,7 +345,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -376,13 +354,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -390,32 +368,33 @@ dependencies = [ [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "3609af4bbf701ddaf1f6bb4e6257dff4ff8932327d0e685d3f653724c258b1ac" dependencies = [ "futures-io", "futures-util", "log", "pin-project-lite", "rustls-native-certs", + "rustls-pki-types", "tokio", "tokio-rustls", "tungstenite", @@ -478,21 +457,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[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" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -517,9 +490,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -553,22 +526,6 @@ dependencies = [ ] [[package]] -name = "block-modes" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" -dependencies = [ - "block-padding 0.2.1", - "cipher 0.3.0", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] name = "block-padding" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -584,31 +541,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "piper", "tracing", ] [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "serde", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytecount" @@ -618,9 +575,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -652,16 +609,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", "libc", ] @@ -678,7 +634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.4.4", + "cipher", "cpufeatures", ] @@ -688,9 +644,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.5.2", + "aead", "chacha20", - "cipher 0.4.4", + "cipher", "poly1305", "zeroize", ] @@ -703,22 +659,22 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -727,15 +683,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -743,15 +699,6 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cipher" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" @@ -763,9 +710,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", "clap_derive", @@ -773,9 +720,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", @@ -785,40 +732,29 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" dependencies = [ "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", ] [[package]] @@ -850,14 +786,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -890,9 +826,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -914,9 +850,9 @@ dependencies = [ [[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", ] @@ -938,9 +874,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -991,55 +927,46 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-channel" -version = "0.5.9" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", ] [[package]] name = "crossbeam-queue" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9bcf5bdbfdd6030fb4a1c497b5d5fc5921aa2f60d359a17e249c0e6df3de153" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1047,7 +974,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossterm_winapi", "futures-core", "libc", @@ -1068,6 +995,12 @@ dependencies = [ ] [[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" @@ -1080,35 +1013,17 @@ dependencies = [ [[package]] name = "ctr" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" -dependencies = [ - "cipher 0.3.0", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher 0.3.0", -] - -[[package]] -name = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher 0.4.4", + "cipher", ] [[package]] name = "curve25519-dalek" -version = "4.0.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +version = "4.1.1" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" dependencies = [ "cfg-if", "cpufeatures", @@ -1125,11 +1040,11 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" version = "0.1.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.0.0#463e5c7cba32561ffee8a281c4455ff3c25660d4" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -1151,9 +1066,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1181,6 +1096,17 @@ dependencies = [ ] [[package]] +name = "derive-where" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1241,7 +1167,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -1273,9 +1199,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" dependencies = [ "serde", ] @@ -1303,9 +1229,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -1313,13 +1239,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -1350,13 +1276,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etcetera" @@ -1388,9 +1310,20 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1403,7 +1336,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", "pin-project-lite", ] @@ -1424,18 +1367,18 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[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 = "fiat-crypto" -version = "0.1.20" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "filetime" @@ -1490,18 +1433,30 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "foreign-types" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ + "foreign-types-macros", "foreign-types-shared", ] [[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "foreign-types-shared" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "form_urlencoded" @@ -1530,9 +1485,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1545,9 +1500,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1555,15 +1510,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1583,9 +1538,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1604,9 +1559,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -1617,32 +1572,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1677,12 +1632,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -1696,9 +1651,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1707,22 +1662,12 @@ dependencies = [ [[package]] name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval 0.5.3", -] - -[[package]] -name = "ghash" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", - "polyval 0.6.1", + "polyval", "zeroize", ] @@ -1740,7 +1685,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gurk" -version = "0.4.0" +version = "0.4.3" dependencies = [ "aho-corasick 0.7.20", "anyhow", @@ -1799,10 +1744,33 @@ dependencies = [ ] [[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.11", + "indexmap", + "slab", + "tokio", + "tokio-util 0.7.10", + "tracing", +] + +[[package]] name = "half" -version = "1.8.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hash32" @@ -1838,10 +1806,10 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -1853,7 +1821,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -1872,15 +1840,6 @@ dependencies = [ [[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" @@ -1890,9 +1849,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" @@ -1956,13 +1915,24 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -1988,13 +1958,14 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", + "h2", + "http 0.2.11", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -2003,16 +1974,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "log", - "rustls", + "rustls 0.22.2", "rustls-native-certs", + "rustls-pki-types", "tokio", "tokio-rustls", ] @@ -2031,16 +2003,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2064,14 +2036,13 @@ 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", - "num-rational", "num-traits", "png", "tiff", @@ -2079,9 +2050,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown", @@ -2099,15 +2070,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "block-padding 0.3.3", + "block-padding", "generic-array", ] [[package]] name = "insta" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" dependencies = [ "console", "lazy_static", @@ -2139,13 +2110,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix 0.38.28", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -2168,9 +2139,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -2182,25 +2153,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -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.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2216,9 +2178,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -2242,34 +2204,47 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] [[package]] +name = "libsignal-core" +version = "0.1.0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +dependencies = [ + "num_enum", + "uuid", +] + +[[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ - "aes 0.8.3", + "aes", "aes-gcm-siv", "arrayref", "async-trait", - "ctr 0.9.2", + "ctr", "curve25519-dalek", + "derive-where", "displaydoc", "hex", "hkdf", "hmac", - "itertools 0.10.5", + "indexmap", + "itertools 0.12.1", + "libsignal-core", "log", "num_enum", "pqcrypto-kyber", "pqcrypto-traits", - "prost 0.9.0", - "prost-build 0.9.0", + "prost 0.12.3", + "prost-build", "rand", + "rayon", "sha2", "signal-crypto", "static_assertions", @@ -2282,31 +2257,33 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" dependencies = [ - "aes 0.7.5", + "aes", "aes-gcm", "async-trait", - "base64 0.13.1", + "base64 0.21.7", "bincode", - "block-modes", "bytes", + "cbc", "chrono", + "ctr", "derivative", "futures", "hex", "hkdf", "hmac", "libsignal-protocol", - "log", "phonenumber", - "prost 0.10.4", - "prost-build 0.10.4", + "prost 0.12.3", + "prost-build", "rand", "serde", "serde_json", "sha2", "thiserror", + "tracing", + "tracing-futures", "url", "uuid", "zkgroup", @@ -2315,7 +2292,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" dependencies = [ "async-trait", "async-tungstenite", @@ -2326,14 +2303,15 @@ dependencies = [ "hyper-rustls", "hyper-timeout", "libsignal-service", - "log", "mpart-async", - "rustls-pemfile 0.3.0", + "rustls-pemfile 2.1.1", "serde", "serde_json", "thiserror", "tokio", "tokio-rustls", + "tracing", + "tracing-futures", "url", ] @@ -2362,9 +2340,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2378,9 +2356,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "log-panics" @@ -2440,9 +2418,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -2486,9 +2464,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -2515,7 +2493,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", + "http 0.2.11", "httparse", "log", "memchr", @@ -2525,7 +2503,7 @@ dependencies = [ "rand", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.6.10", ] [[package]] @@ -2553,7 +2531,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "libc", ] @@ -2609,31 +2587,25 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-iter" -version = "0.1.43" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-integer", "num-traits", ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "num-iter" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2642,9 +2614,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2678,7 +2650,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -2712,9 +2684,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2739,9 +2711,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 = "opener" @@ -2771,12 +2743,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2840,6 +2812,26 @@ dependencies = [ ] [[package]] +name = "partial-default" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "124dc3c21ffb6fb3a0562d129929a8a54998766ef7adc1ba09ddc467d092c14b" +dependencies = [ + "partial-default-derive", +] + +[[package]] +name = "partial-default-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "paste" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2920,6 +2912,26 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2965,15 +2977,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "plotters" @@ -3005,9 +3017,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", @@ -3019,7 +3031,7 @@ dependencies = [ [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "curve25519-dalek", "hmac", @@ -3045,14 +3057,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.31", "tracing", "windows-sys 0.52.0", ] @@ -3065,19 +3077,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", - "universal-hash 0.5.1", -] - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash 0.4.0", + "universal-hash", ] [[package]] @@ -3089,7 +3089,7 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug", - "universal-hash 0.5.1", + "universal-hash", ] [[package]] @@ -3130,9 +3130,9 @@ dependencies = [ [[package]] name = "pqcrypto-kyber" -version = "0.7.6" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9d9695c19e525d5366c913562a331fbeef9a2ad801d9a9ded61a0e4c2fe0fb" +checksum = "c32fe9d5c9913b1aed1ba92b3449eb2d7cf7ca29741b11455dfa34c711b95776" dependencies = [ "cc", "glob", @@ -3149,15 +3149,15 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" -version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=6d7003f#6d7003fed1fa0397d42ac257ed49573d01ca6e93" +version = "0.6.1" +source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "futures", + "hex", "libsignal-service", "libsignal-service-hyper", "log", - "parking_lot 0.11.2", "rand", "serde", "serde_json", @@ -3170,7 +3170,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/whisperfish/presage?rev=6d7003f#6d7003fed1fa0397d42ac257ed49573d01ca6e93" +source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" dependencies = [ "blake3", "chacha20poly1305", @@ -3187,16 +3187,16 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=6d7003f#6d7003fed1fa0397d42ac257ed49573d01ca6e93" +source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" dependencies = [ "async-trait", - "base64 0.12.3", + "base64 0.21.7", "fs_extra", "log", "presage", "presage-store-cipher", - "prost 0.10.4", - "prost-build 0.10.4", + "prost 0.12.3", + "prost-build", "quickcheck_macros", "serde", "serde_json", @@ -3206,6 +3206,16 @@ 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.52", +] + +[[package]] name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3217,25 +3227,15 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" -dependencies = [ - "bytes", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" @@ -3245,52 +3245,42 @@ dependencies = [ ] [[package]] -name = "prost-build" -version = "0.9.0" +name = "prost" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "heck 0.3.3", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.9.0", - "prost-types 0.9.0", - "regex", - "tempfile", - "which", + "prost-derive 0.12.3", ] [[package]] name = "prost-build" -version = "0.10.4" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", - "cfg-if", - "cmake", - "heck 0.4.1", - "itertools 0.10.5", - "lazy_static", + "heck", + "itertools 0.11.0", "log", "multimap", + "once_cell", "petgraph", - "prost 0.10.4", - "prost-types 0.10.1", + "prettyplease", + "prost 0.12.3", + "prost-types", "regex", + "syn 2.0.52", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools 0.10.5", @@ -3301,44 +3291,33 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost 0.9.0", -] - -[[package]] -name = "prost-types" -version = "0.10.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "bytes", - "prost 0.10.4", + "prost 0.12.3", ] [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "getopts", "memchr", "unicase", @@ -3381,6 +3360,15 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] name = "quickcheck" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3404,9 +3392,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3447,7 +3435,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cassowary", "crossterm", "indoc", @@ -3460,9 +3448,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3470,9 +3458,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", @@ -3509,13 +3497,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick 1.1.2", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -3530,9 +3518,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick 1.1.2", "memchr", @@ -3565,16 +3553,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[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", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3628,14 +3617,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -3645,43 +3634,64 @@ version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ - "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pemfile 2.1.1", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3692,6 +3702,17 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] name = "rustversion" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3699,9 +3720,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3714,11 +3735,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3768,35 +3789,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3805,13 +3826,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -3848,13 +3869,13 @@ dependencies = [ [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ - "aes 0.8.3", + "aes", "cbc", - "ctr 0.9.2", + "ctr", "displaydoc", - "ghash 0.5.0", + "ghash", "hmac", "sha1", "sha2", @@ -3910,9 +3931,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" [[package]] name = "siphasher" @@ -3947,9 +3968,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -3969,12 +3990,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4008,7 +4029,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.12.0", + "itertools 0.12.1", "nom", "unicode_categories", ] @@ -4055,7 +4076,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -4093,7 +4114,7 @@ dependencies = [ "atomic-write-file", "dotenvy", "either", - "heck 0.4.1", + "heck", "hex", "once_cell", "proc-macro2", @@ -4118,8 +4139,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "bytes", "chrono", @@ -4162,8 +4183,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "chrono", "crc", @@ -4234,12 +4255,6 @@ 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 = "stringprep" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4252,9 +4267,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" @@ -4280,7 +4295,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", @@ -4293,11 +4308,11 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -4319,9 +4334,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -4351,22 +4366,21 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.28", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[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 = [ "smawk", "unicode-linebreak", @@ -4375,29 +4389,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[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", @@ -4405,9 +4419,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", @@ -4416,12 +4430,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -4436,10 +4451,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -4470,9 +4486,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -4480,7 +4496,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] @@ -4503,16 +4519,17 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] @@ -4542,6 +4559,20 @@ dependencies = [ ] [[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", + "tokio", + "tracing", +] + +[[package]] name = "toml" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4605,7 +4636,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -4619,6 +4650,16 @@ dependencies = [ ] [[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4665,18 +4706,19 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.0.0", "httparse", "log", "rand", - "rustls", + "rustls 0.22.2", + "rustls-pki-types", "sha1", "thiserror", "url", @@ -4711,9 +4753,9 @@ dependencies = [ [[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" @@ -4729,18 +4771,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[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" @@ -4756,16 +4798,6 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "universal-hash" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "universal-hash" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" @@ -4812,9 +4844,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", "serde", @@ -4871,9 +4903,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4881,24 +4913,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4906,32 +4938,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wayland-backend" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "nix 0.26.4", + "rustix 0.38.31", "scoped-tls", "smallvec", "wayland-sys", @@ -4939,23 +4971,23 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 2.4.1", - "nix 0.26.4", + "bitflags 2.4.2", + "rustix 0.38.31", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-protocols" -version = "0.31.0" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4967,7 +4999,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "wayland-backend", "wayland-client", "wayland-protocols", @@ -4976,12 +5008,12 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", - "quick-xml 0.30.0", + "quick-xml 0.31.0", "quote", ] @@ -4998,9 +5030,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -5008,15 +5040,15 @@ 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 = "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 = "which" @@ -5027,7 +5059,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -5066,15 +5098,6 @@ dependencies = [ ] [[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5086,7 +5109,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] @@ -5100,12 +5123,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.45.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -5123,22 +5146,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.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", + "windows-targets 0.52.4", ] [[package]] @@ -5158,42 +5166,30 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 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.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.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -5203,15 +5199,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -5221,15 +5211,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -5239,15 +5223,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -5257,15 +5235,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -5275,15 +5247,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -5293,15 +5259,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.5.30" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -5328,31 +5294,26 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", + "rustix 0.38.31", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[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", @@ -5362,22 +5323,22 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dae5072fe1f8db8f8d29059189ac175196e410e40ba42d5d4684ae2f750995" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.12", - "rustix 0.38.28", + "linux-raw-sys 0.4.13", + "rustix 0.38.31", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix 0.26.4", + "libc", "winapi", ] @@ -5435,9 +5396,9 @@ dependencies = [ [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", @@ -5476,9 +5437,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5490,9 +5451,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -5501,22 +5462,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] @@ -5536,33 +5497,40 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.52", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "curve25519-dalek", + "derive-where", "displaydoc", "lazy_static", + "partial-default", "poksho", "serde", + "subtle", ] [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364" +source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" dependencies = [ "aes-gcm-siv", "bincode", "curve25519-dalek", + "derive-where", "displaydoc", "hex", + "hex-literal", + "hkdf", "lazy_static", - "libsignal-protocol", + "libsignal-core", + "partial-default", "poksho", "serde", "sha2", @@ -5574,9 +5542,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", @@ -5588,9 +5556,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 63d8581aa7664..7bcc99d98063d 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UTjTXUc0W+vlO77ilveAy0HWF5KSKbDnrg5ewTyuTdA="; + hash = "sha256-MPYqWgwh5PKH3GsCDx6aa4ryorWZ96YK8KOYZ5PILkk="; }; postPatch = '' @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM="; - "libsignal-service-0.1.0" = "sha256-OWLtaxldKgYPP/aJuWezNkNN0990l3RtDWK38R1fL90="; - "curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0="; - "presage-0.6.0-dev" = "sha256-65YhxMAAFsnOprBWiB0uH/R9iITt+EYn+kMVjAwTgOQ="; + "libsignal-protocol-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE="; + "libsignal-service-0.1.0" = "sha256-p0umCPtBg9s4G6RHcwK/tU+RtQE2fFLRHOYt2GmBCtQ="; + "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc="; + "presage-0.6.1" = "sha256-MsVSUI4ht+ftO2UC1IIeCtomkzg4ug95kKsc41PDVNg="; "qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 2debdc6140d2b..7a3ad36e47b74 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs }: @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/applications/networking/instant-messengers/iamb/default.nix index 6e4e5276e582a..03d8b1cc13db1 100644 --- a/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "iamb"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "ulyssa"; repo = "iamb"; rev = "v${version}"; - hash = "sha256-Mt4/UWySC6keoNvb1VDCVPoK24F0rmd0R47ZRPADkaw="; + hash = "sha256-UYc7iphpzqZPwhOn/ia7XvnnlIUvM7nSFBz67ZkXmNs="; }; - cargoHash = "sha256-UbmeEcmUr3zx05Hk36tjsl0Y9ay7DNM1u/3lPqlXN2o="; + cargoHash = "sha256-982FdK6ej3Bbg4R9e43VSwlni837ZK4rkMkoeYMyW8E="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 71253c52b6438..83a3b78e1d4bd 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -10,18 +10,17 @@ , libXtst , zlib , electron -, pipewire }: buildNpmPackage rec { pname = "jitsi-meet-electron"; - version = "2023.11.3"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "jitsi"; repo = "jitsi-meet-electron"; rev = "v${version}"; - hash = "sha256-gE5CP0l3SrAHGNS6Hr5/MefTtE86JTmc85CwOmylEpg="; + hash = "sha256-BGN+t9Caw5n/NN1E5Oi/ruMLjoVh0jUlpzYR6vodHbw="; }; nativeBuildInputs = [ @@ -38,7 +37,7 @@ buildNpmPackage rec { zlib ]; - npmDepsHash = "sha256-JZVJcKzG4X7YIUvIRWZsDQnHx+dNqCj6kFm8mZaSH2k="; + npmDepsHash = "sha256-KanG8y+tYzswCCXjSkOlk+p9XKaouP2Z7IhsD5bDtRk="; makeCacheWritable = true; @@ -72,7 +71,6 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \ --add-flags $out/share/jitsi-meet-electron/resources/app.asar \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pipewire ]} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --inherit-argv0 diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index dbe944d189b6b..5b5669a3a6a20 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,31 +1,41 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, - attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus, - prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, installShellFiles, nixosTests, - - pytest, faker, pytest-aiohttp, aioresponses, - - enableDbusUi ? true +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, installShellFiles +, nixosTests +, enableDbusUi ? true }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pantalaimon"; version = "0.10.5"; - - disabled = pythonOlder "3.6"; + pyproject = true; # pypi tarball miss tests src = fetchFromGitHub { owner = "matrix-org"; - repo = pname; + repo = "pantalaimon"; rev = version; - sha256 = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; + hash = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; }; - propagatedBuildInputs = [ + build-system = [ + installShellFiles + ] ++ (with python3Packages; [ + setuptools + pythonRelaxDepsHook + ]); + + pythonRelaxDeps = [ + "matrix-nio" + ]; + + dependencies = with python3Packages; [ aiohttp appdirs attrs + cachetools click janus keyring @@ -33,34 +43,28 @@ buildPythonApplication rec { matrix-nio peewee prompt-toolkit - setuptools ] ++ matrix-nio.optional-dependencies.e2e - ++ lib.optionals enableDbusUi [ - dbus-python - notify2 - pygobject3 - pydbus + ++ lib.optionals enableDbusUi optional-dependencies.ui; + + optional-dependencies.ui = with python3Packages; [ + dbus-python + notify2 + pygobject3 + pydbus ]; - nativeCheckInputs = [ - pytest + nativeCheckInputs = with python3Packages; [ + aioresponses faker pytest-aiohttp - aioresponses - ]; - - nativeBuildInputs = [ - installShellFiles - ]; + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); # darwin has difficulty communicating with server, fails some integration tests doCheck = !stdenv.isDarwin; - checkPhase = '' - pytest - ''; - postInstall = '' installManPage docs/man/*.[1-9] ''; diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 0f02f0413506d..d0a7bbf2a1a99 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -19,7 +19,9 @@ , vips , at-spi2-core , autoPatchelfHook +, makeShellWrapper , wrapGAppsHook +, commandLineArgs ? "" }: let @@ -43,6 +45,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook + makeShellWrapper wrapGAppsHook dpkg ]; @@ -62,6 +65,8 @@ stdenv.mkDerivation { xorg.libXdamage ]; + dontWrapGApps = true; + runtimeDependencies = map lib.getLib [ systemd ]; @@ -75,9 +80,12 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/qq.desktop \ --replace "/opt/QQ/qq" "$out/bin/qq" \ --replace "/usr/share" "$out/share" - makeWrapper $out/opt/QQ/qq $out/bin/qq \ + makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --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 diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 87f0cd4c9747e..53762baf82fff 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-PmTiXQp+AkTwCKisH1tR6B1+cHPx25P8FAAlLvKEb3w="; + hash = "sha256-fSj/AX1uCUAC3Vg5+rtGF3IDPFTHRAgJ8CPVL8BYc+E="; }; desktopItem = (makeDesktopItem { @@ -39,5 +39,6 @@ appimageTools.wrapType2 { license = licenses.unfree; maintainers = with maintainers; [ nazarewk ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 7fd0bd9bb1d34..82d1fdff2e808 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -63,7 +63,7 @@ mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 2f62a08f46256..792b51ef47158 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk21_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.12.8"; + version = "0.13.2"; # 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-jBz1D1Uz3z+QYj+zAOrbSIkZZeKWSwU3/pHI+sDjJHw="; + hash = "sha256-5+pIkRdcFWTNmsSN2tHSy6XMQfUpGSddGsdw5guWzjA="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${openjdk17_headless}" \ + makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk21_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \ - --set JAVA_HOME ${openjdk17_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \ + --set JAVA_HOME ${openjdk21_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index 46c049b9d2f22..dffcdc6172f28 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.46.0"; + version = "7.3.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-rHmG2brzlQtYd3l5EFhjndPF5T7nQWzUhEe7LsEFVpc="; + hash = "sha256-RIOMIAXdBMr1Bi1TDFr4VD0w8JfBKzwEjpYS/DfV5kc="; } 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 18ed9ac055e80..62b6e1c9a4847 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.3.0-beta.1"; + version = "7.6.0-beta.3"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-sXZC6JgeMlX3lNPSMdB64SyiOAMPkjDAjYZrEwnIMpM="; + hash = "sha256-BbXogNB2BxFQTpvHw0JVOaCV2PQHEQbafSavVcBd/Fg="; } 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 f262f2c97b6fb..130508f95e30b 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.1.1"; + version = "7.5.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-YQLDm6T67vio66PLehlLQDxsAkhm22dhpjUR1eBwsg8="; + hash = "sha256-afKR+P2YPkv4OMIr8LzWeAMZWr0zaJ1R0BQD87gQuSk="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 454d6343d15be..eda54f85a0cac 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 = "20240318"; + version = "20240415-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-KK+KQowI0KKwgZE91xivfmhnHyDMRozfpLsrOLuE+FE="; + hash = "sha256-fMt5F+ykMxaP/6gEVN7TabENTSKbO4Gpms5yD+MBzPc="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index b19d1f6f8a010..e0ce9027551c2 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.36.140"; - x86_64-darwin-sha256 = "0w1fxza3aglh7513znv190gsha12rk7k1ybdp4ml2pffwmm8diad"; + x86_64-darwin-version = "4.37.101"; + x86_64-darwin-sha256 = "03k4iv6y7y1z9ac7if35r3lk7kp7ic4aa4rdyzbrzihvpfb3nvdh"; - x86_64-linux-version = "4.36.140"; - x86_64-linux-sha256 = "0zahhhpcb1dxdhfmam32iqr5w3pspzbmcdv53ciqfnbkmwzkc3xr"; + x86_64-linux-version = "4.37.101"; + x86_64-linux-sha256 = "0vmaam0aiqcqmm8n3zrjmf012d6pdi0g1d08v1zhgx2rhl614ff9"; - aarch64-darwin-version = "4.36.140"; - aarch64-darwin-sha256 = "118mzkpk431dcm61gkbj5m4sdxkwnk6fvmxg9f96xiv6n22n7pnx"; + aarch64-darwin-version = "4.37.101"; + aarch64-darwin-sha256 = "07qfqrq32sh5cw7vmq2x0s5zvkvcl7j1kkvdncg36fay9276f2pp"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index c32e55ffde4ef..c68af388f323c 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -20,7 +20,7 @@ , python3 , webkitgtk_6_0 , blueprint-compiler -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config python3 blueprint-compiler - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 0d430af0894c7..f59b9c3774bc6 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -7,11 +7,8 @@ , yarn , nodejs , fetchYarnDeps -, prefetch-yarn-deps +, fixup-yarn-lock , electron -, libnotify -, libpulseaudio -, pipewire , alsa-utils , which , testers @@ -20,21 +17,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.4.14"; + version = "1.4.27"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-qdox6C6ztWECwSqHZoZHMbqPFrokPK0u44NUG+SHmPk="; + hash = "sha256-nUHiveS1XI+vC2Tj1DK/DS4CrKTLMg1IYgTPWXuLrAc="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-++ZPsBH0qHCykexpY2aZukAc+Ak1wEzAUker8ZLxA9Q="; + hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78="; }; - nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ yarn fixup-yarn-lock nodejs copyDesktopItems makeWrapper ]; configurePhase = '' runHook preConfigure @@ -72,11 +69,10 @@ stdenv.mkDerivation (finalAttrs: { done popd - # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, 'libpipewire' for screen sharing and 'libnotify' for notifications + # Linux needs 'aplay' for notification sounds makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ ${lib.optionalString stdenv.isLinux '' --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire libnotify ]} \ ''} \ --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index a0c7b678d5a0d..45197d2d70866 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages.libcxx ]; desktopItem = makeDesktopItem { 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 8f94ec6e5acdb..906736be49774 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -30,7 +30,6 @@ , range-v3 , tl-expected , hunspell -, glibmm_2_68 , webkitgtk_6_0 , jemalloc , rnnoise @@ -64,14 +63,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.15.2"; + version = "4.16.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-gzwDezOmIvSF4fPHAslf8DyBAgCYkD5ySX+MKKMXhSg="; + hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0="; }; patches = [ @@ -144,7 +143,6 @@ stdenv.mkDerivation rec { libpulseaudio pipewire hunspell - glibmm_2_68 webkitgtk_6_0 jemalloc ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch index 3036af515ea36..37b13b6844f32 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/macos.patch @@ -49,6 +49,70 @@ index 7ce90d3..dac3c2c 100644 const auto state = DetectBatteryState(); if (!state.has || !state.draining) { return false; +Submodule Telegram/lib_webrtc contains modified content +diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +index 7521c08..5e22da2 100644 +--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm ++++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); + AudioDeviceListChangedMonitor.registerEnvironment(this); + ++#if 0 + if (@available(macOS 14.0, *)) { + const auto weak = base::make_weak(this); + id block = [^(BOOL shouldBeMuted){ +@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + setInputMuteStateChangeHandler:block + error:nil]; + } ++#endif + } + + EnvironmentMac::~EnvironmentMac() { +@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { + } + + void EnvironmentMac::setCaptureMuted(bool muted) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (!_captureMuteNotification) { + const auto value = muted ? YES : NO; + [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; + } + } ++#endif + } + + void EnvironmentMac::captureMuteSubscribe() { ++#if 0 + if (@available(macOS 14.0, *)) { + id observer = [[InputMuteObserver alloc] init]; + [[[NSWorkspace sharedWorkspace] notificationCenter] +@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { + [observer release]; + }); + } ++#endif + } + + void EnvironmentMac::captureMuteUnsubscribe() { +@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { + void EnvironmentMac::setCaptureMuteTracker( + not_null<CaptureMuteTracker*> tracker, + bool track) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (track) { + if (!_captureMuteTracker) { +@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( + } + } + } ++#endif + } + + std::unique_ptr<Environment> CreateEnvironment( Submodule Telegram/lib_webview contains modified content diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm index 738e574..80ff5f0 100644 diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix deleted file mode 100644 index bd3f30adc6887..0000000000000 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus -, qrencode, gdk-pixbuf, libnotify }: - -stdenv.mkDerivation rec { - pname = "toxic"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "Tox"; - repo = "toxic"; - rev = "v${version}"; - sha256 = "sha256-BabRY9iu5ccEXo5POrWkWaIWAeQU4MVlMK8I+Iju6aQ="; - }; - - makeFlags = [ "PREFIX=$(out)"]; - installFlags = [ "PREFIX=$(out)"]; - - buildInputs = [ - libtoxcore libsodium ncurses curl gdk-pixbuf libnotify - ] ++ lib.optionals (!stdenv.isAarch32) [ - openal libopus libvpx freealut qrencode - ]; - nativeBuildInputs = [ pkg-config libconfig ]; - - meta = with lib; src.meta // { - description = "Reference CLI for Tox"; - mainProgram = "toxic"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 982b41b27946f..4b4ce6f1f9b30 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.5"; + version = "2.6.6"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eJw3C38+FdiMLE+x+akIo8c/VqsbWVbcGJj1Lb2vImE="; + hash = "sha256-71VpLTPOqSEosLt3noiWhsFPpIp7n3S3BHhIzWYGwkI="; }; - cargoHash = "sha256-zhRrZr5RXKhjZCIjN3lRJ8BJlW/zxKJUzWtpOygX9oo="; + cargoHash = "sha256-2SWYKqZfIN+Ghryuoh77eDiM7cqJcLihdWpEhOGpLZg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index d2796142e8f7d..aebe2998bd277 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -3,9 +3,6 @@ , fetchFromGitHub , copyDesktopItems , python3 -, pipewire -, libpulseaudio -, libnotify , xdg-utils , electron_29 , makeDesktopItem @@ -42,11 +39,6 @@ buildNpmPackage rec { # override installPhase so we can copy the only folders that matter installPhase = let - libPath = lib.makeLibraryPath [ - libpulseaudio - pipewire - libnotify - ]; binPath = lib.makeBinPath [ xdg-utils ]; in '' @@ -62,7 +54,6 @@ buildNpmPackage rec { # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${lib.getExe electron_29}' $out/bin/webcord \ - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${binPath}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/lib/node_modules/webcord/ diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index c55178060fc85..6793c187e54ae 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "43.11.0.27795"; + version = "43.11.0.28947"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20231108131957/Webex_ubuntu.7z"; - sha256 = "e7a30481840a4a56c7ac38fa9efb487c722758ad9ac875432e86232d6a8e6466"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240311173044/Webex_ubuntu.7z"; + sha256 = "f84669a2cd974435c6c0f8a6dc5a62c4ef01a3848e36ffcc8077f718be4a3b86"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9aaba98710e30..4109c5f04cf27 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -26,19 +26,19 @@ let pname = "wire-desktop"; version = let - x86_64-darwin = "3.32.4589"; + x86_64-darwin = "3.35.4861"; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.32.3079"; + x86_64-linux = "3.35.3348"; }.${system} or throwSystem; hash = let - x86_64-darwin = "sha256-PDAZCnkgzlausdtwycK+PHfp+zmL33VnX6RzCsgBTZ4="; + x86_64-darwin = "sha256-QPxslMEz1jOH2LceFOdCyVDtpya1SfJ8GWMIAIhie4U="; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-+4aRis141ctI50BtBwipoVtPoMGRs82ENqZ+y2ZlL58="; + x86_64-linux = "sha256-KtDUuAzD53mFJ0+yywp0Q2/hx9MGsOhFjRLWsZAd+h0="; }.${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 5c96be3bb82e1..cdf8f4f886d60 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ --prefix LD_LIBRARY_PATH ":" ${libs} - # Backwards compatiblity: we used to call it zoom-us + # Backwards compatibility: we used to call it zoom-us ln -s $out/bin/{zoom,zoom-us} ''; diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 3b12634b0caa1..81c6a39e27d18 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.10.5"; + version = "5.11.0"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-dWTczjE6QAW26bGTIeFTuXl1JwYr3Ma+8Ab6MjeDr78="; + hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0="; name="${pname}-${version}.AppImage"; }; @@ -20,7 +20,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"; + runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"; extraInstallCommands = '' mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix deleted file mode 100644 index 844b8648d6c85..0000000000000 --- a/pkgs/applications/networking/insync/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ lib -, writeShellScript -, buildFHSEnvBubblewrap -, stdenvNoCC -, fetchurl -, autoPatchelfHook -, dpkg -, nss -, libvorbis -, libdrm -, libGL -, wayland -, xkeyboard_config -, libthai -}: - -let - pname = "insync"; - version = "3.8.6.50504"; - meta = with lib; { - platforms = ["x86_64-linux"]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ hellwolf ]; - homepage = "https://www.insynchq.com"; - description = "Google Drive sync and backup with multiple account support"; - longDescription = '' - Insync is a commercial application that syncs your Drive files to your - computer. It has more advanced features than Google's official client - such as multiple account support, Google Doc conversion, symlink support, - and built in sharing. - - There is a 15-day free trial, and it is a paid application after that. - - Known bug(s): - - 1) Currently the system try icon does not render correctly. - 2) libqtvirtualkeyboardplugin does not have necessary Qt library shipped from vendor. - ''; - mainProgram = "insync"; - }; - - insync-pkg = stdenvNoCC.mkDerivation { - name = "${pname}-pkg-${version}"; - inherit version meta; - - src = fetchurl { - # Find a binary from https://www.insynchq.com/downloads/linux#ubuntu. - url = "https://cdn.insynchq.com/builds/linux/insync_${version}-lunar_amd64.deb"; - sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0="; - }; - - buildInputs = [ - nss - libvorbis - libdrm - libGL - wayland - libthai - ]; - - nativeBuildInputs = [ autoPatchelfHook dpkg ]; - - unpackPhase = '' - dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -R usr/* $out/ - - # use system glibc - rm $out/lib/insync/{libgcc_s.so.1,libstdc++.so.6} - - # remove badly packaged plugins - rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so - - # remove the unused vendor wrapper - rm $out/bin/insync - - runHook postInstall - ''; - - # NB! This did the trick, otherwise it segfaults! However I don't understand why! - dontStrip = true; - }; - -in buildFHSEnvBubblewrap { - name = pname; - inherit meta; - - targetPkgs = pkgs: with pkgs; [ - insync-pkg - libudev0-shim - ]; - - runScript = writeShellScript "insync-wrapper.sh" '' - # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. - echo Unsetting QT_STYLE_OVERRIDE=$QT_STYLE_OVERRIDE - echo Unsetting QT_QPA_PLATFORMTHEME=$QT_QPA_PLATFORMTHEME - unset QT_STYLE_OVERRIDE - unset QPA_PLATFORMTHEME - - # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 - export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ - echo XKB_CONFIG_ROOT=$XKB_CONFIG_ROOT - - # For debuging: - # export QT_DEBUG_PLUGINS=1 - # find -L /usr/share -name "*insync*" - - exec /usr/lib/insync/insync "$@" - ''; - - # As intended by this bubble wrap, share as much namespaces as possible with user. - unshareUser = false; - unshareIpc = false; - unsharePid = false; - unshareNet = false; - unshareUts = false; - unshareCgroup = false; - # Since "insync start" command starts a daemon, this daemon should die with it. - dieWithParent = false; -} diff --git a/pkgs/applications/networking/irc/halloy/Cargo.lock b/pkgs/applications/networking/irc/halloy/Cargo.lock deleted file mode 100644 index bd8a9f07c52ac..0000000000000 --- a/pkgs/applications/networking/irc/halloy/Cargo.lock +++ /dev/null @@ -1,4942 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" - -[[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 = "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 = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-activity" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" -dependencies = [ - "android-properties", - "bitflags 2.4.2", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[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 = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - -[[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-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 2.8.0", - "rustix 0.37.19", - "slab", - "socket2", - "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", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.19", - "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", - "quote", - "syn 2.0.48", -] - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[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", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "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.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[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 = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2", -] - -[[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 = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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 = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.4.2", - "log", - "polling 3.3.2", - "rustix 0.38.30", - "slab", - "thiserror", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop", - "rustix 0.38.30", - "wayland-backend", - "wayland-client 0.31.2", -] - -[[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 = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clipboard-win" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" -dependencies = [ - "error-code", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" -dependencies = [ - "thiserror", - "x11rb 0.9.0", -] - -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "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 = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.6" -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 = "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 = "core-graphics" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "cosmic-text" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" -dependencies = [ - "fontdb", - "libm", - "log", - "rangemap", - "rustc-hash", - "rustybuzz", - "self_cell", - "swash", - "sys-locale", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "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 = "ctor" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" -dependencies = [ - "quote", - "syn 2.0.48", -] - -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "d3d12" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" -dependencies = [ - "bitflags 2.4.2", - "libloading 0.8.0", - "winapi", -] - -[[package]] -name = "data" -version = "0.1.0" -dependencies = [ - "base64", - "chrono", - "dirs-next", - "flate2", - "futures", - "iced_core", - "irc", - "itertools", - "log", - "palette", - "rand", - "rand_chacha", - "seahash", - "serde", - "serde_json", - "serde_yaml", - "thiserror", - "tokio", - "tokio-stream", -] - -[[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 = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.0", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "drm" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" -dependencies = [ - "bitflags 2.4.2", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.30", -] - -[[package]] -name = "drm-ffi" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" -dependencies = [ - "drm-sys", - "rustix 0.38.30", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" -dependencies = [ - "libc", - "linux-raw-sys 0.6.4", -] - -[[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", - "vswhom", - "winreg", -] - -[[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.48", -] - -[[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 = "error-code" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" - -[[package]] -name = "etagere" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[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 = "exr" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.7.1", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[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 = [ - "log", -] - -[[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 = "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", -] - -[[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.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2 0.8.0", - "slotmap", - "tinyvec", - "ttf-parser 0.19.0", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "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", - "num_cpus", -] - -[[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.48", -] - -[[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 = "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", -] - -[[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.0", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "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 = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glam" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "glyphon" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a62d0338e4056db6a73221c2fb2e30619452f6ea9651bac4110f51b0f7a7581" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.4.2", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "gpu-allocator" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" -dependencies = [ - "log", - "presser", - "thiserror", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags 1.3.2", - "gpu-descriptor-types", - "hashbrown 0.12.3", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "half" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "halloy" -version = "0.1.0" -dependencies = [ - "chrono", - "data", - "embed-resource", - "fern", - "iced", - "image", - "log", - "notify-rust", - "once_cell", - "open", - "palette", - "thiserror", - "tokio", - "unicode-segmentation", - "uuid", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash 0.8.7", - "allocator-api2", -] - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.4.2", - "com", - "libc", - "libloading 0.8.0", - "thiserror", - "widestring", - "winapi", -] - -[[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.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[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 = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[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", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows 0.48.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "iced" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_core", - "iced_futures", - "iced_renderer", - "iced_widget", - "iced_winit", - "image", - "thiserror", -] - -[[package]] -name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "bitflags 1.3.2", - "log", - "num-traits", - "palette", - "raw-window-handle", - "smol_str", - "thiserror", - "web-time", - "xxhash-rust", -] - -[[package]] -name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "futures", - "iced_core", - "log", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "cosmic-text", - "glam", - "half", - "iced_core", - "iced_futures", - "image", - "kamadak-exif", - "log", - "once_cell", - "raw-window-handle", - "rustc-hash", - "thiserror", - "unicode-segmentation", - "xxhash-rust", -] - -[[package]] -name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_graphics", - "iced_tiny_skia", - "iced_wgpu", - "log", - "thiserror", -] - -[[package]] -name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_core", - "iced_futures", - "thiserror", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_core", - "once_cell", - "palette", -] - -[[package]] -name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "bytemuck", - "cosmic-text", - "iced_graphics", - "kurbo", - "log", - "rustc-hash", - "softbuffer", - "tiny-skia", - "xxhash-rust", -] - -[[package]] -name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "futures", - "glam", - "glyphon", - "guillotiere", - "iced_graphics", - "log", - "once_cell", - "wgpu", -] - -[[package]] -name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_renderer", - "iced_runtime", - "iced_style", - "num-traits", - "ouroboros", - "thiserror", - "unicode-segmentation", -] - -[[package]] -name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_graphics", - "iced_runtime", - "iced_style", - "log", - "thiserror", - "tracing", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - -[[package]] -name = "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", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[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", -] - -[[package]] -name = "indexmap" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[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.2", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "irc" -version = "0.1.0" -dependencies = [ - "bytes", - "futures", - "irc_proto", - "thiserror", - "tokio", - "tokio-native-tls", - "tokio-util", -] - -[[package]] -name = "irc_proto" -version = "0.1.0" -dependencies = [ - "itertools", - "nom", - "thiserror", -] - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "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.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[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.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.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.0", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "linux-raw-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" - -[[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 = "lru" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" -dependencies = [ - "hashbrown 0.14.3", -] - -[[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 0.3.23", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - -[[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.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" -dependencies = [ - "bitflags 2.4.2", - "block", - "core-graphics-types", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" -dependencies = [ - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" -dependencies = [ - "bit-set", - "bitflags 2.4.2", - "codespan-reporting", - "hexf-parse", - "indexmap 2.2.1", - "log", - "num-traits", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[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.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.4.2", - "jni-sys", - "log", - "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.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "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 1.3.2", - "cfg-if", - "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 1.3.2", - "cfg-if", - "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 = "notify-rust" -version = "4.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" -dependencies = [ - "log", - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", -] - -[[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.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.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.48", -] - -[[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-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - -[[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 = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "openssl" -version = "0.10.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "orbclient" -version = "0.3.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" -dependencies = [ - "redox_syscall 0.3.5", -] - -[[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 = "ouroboros" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d813b7b31a82efae94bd30ffaac09aec85efc18db2d5ec3aead1a220ee954351" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56f651b4dd45ae3ac3d260ced32eaf0620cddaae5f26c69b554a9016594726" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" -dependencies = [ - "ttf-parser 0.19.0", -] - -[[package]] -name = "palette" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d38e6e5ca1612e2081cc31188f08c3cba630ce4ba44709a153f1a0f38d678f2" -dependencies = [ - "approx", - "fast-srgb8", - "palette_derive", - "phf", -] - -[[package]] -name = "palette_derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d1c929301fee6830dafa764341118829b2535c216b0571e3821ecac5c885b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - -[[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 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[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 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[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 = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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 = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags 1.3.2", - "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", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.30", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[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.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[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.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - -[[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 = "range-alloc" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" - -[[package]] -name = "rangemap" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" - -[[package]] -name = "raw-window-handle" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" - -[[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 = "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "renderdoc-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[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.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys 0.4.13", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustybuzz" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "libm", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[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.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[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 = "sctk-adwaita" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" -dependencies = [ - "ab_glyph", - "log", - "memmap2 0.9.4", - "smithay-client-toolkit 0.18.0", - "tiny-skia", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" -dependencies = [ - "bitflags 1.3.2", - "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 = "self_cell" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" - -[[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.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_spanned" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" -dependencies = [ - "indexmap 2.2.1", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[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 = "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 = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags 1.3.2", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client 0.29.5", - "wayland-cursor 0.29.5", - "wayland-protocols 0.29.5", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" -dependencies = [ - "bitflags 2.4.2", - "calloop", - "calloop-wayland-source", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.4", - "rustix 0.38.30", - "thiserror", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-csd-frame", - "wayland-cursor 0.31.1", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr", - "wayland-scanner 0.31.1", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit 0.16.0", - "wayland-client 0.29.5", -] - -[[package]] -name = "smol_str" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "softbuffer" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "cfg_aliases 0.2.0", - "cocoa", - "core-graphics", - "drm", - "fastrand 2.0.1", - "foreign-types 0.5.0", - "js-sys", - "log", - "memmap2 0.9.4", - "objc", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.30", - "tiny-xlib", - "wasm-bindgen", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-sys 0.31.1", - "web-sys", - "windows-sys 0.52.0", - "x11rb 0.13.0", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spirv" -version = "0.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.4.2", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - -[[package]] -name = "svg_fmt" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" - -[[package]] -name = "swash" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" -dependencies = [ - "yazi", - "zeno", -] - -[[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.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" -dependencies = [ - "libc", -] - -[[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", - "fastrand 1.9.0", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[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", -] - -[[package]] -name = "time" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" -dependencies = [ - "serde", - "time-core", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "tiny-skia" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" -dependencies = [ - "as-raw-xcb-connection", - "ctor", - "libloading 0.8.0", - "tracing", -] - -[[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.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" -dependencies = [ - "autocfg", - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "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", - "quote", - "syn 2.0.48", -] - -[[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-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "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.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" -dependencies = [ - "indexmap 1.9.3", - "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.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "ttf-parser" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" - -[[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.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-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" - -[[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 = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - -[[package]] -name = "uuid" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" -dependencies = [ - "getrandom", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.30", - "scoped-tls", - "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.4.2", - "rustix 0.38.30", - "wayland-backend", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.4.2", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client 0.29.5", - "xcursor", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" -dependencies = [ - "rustix 0.38.30", - "wayland-client 0.31.2", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-scanner 0.29.5", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.4.2", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.4.2", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.4.2", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml 0.31.0", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "wgpu" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" -dependencies = [ - "arrayvec", - "cfg-if", - "cfg_aliases 0.1.1", - "js-sys", - "log", - "naga", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.4.2", - "cfg_aliases 0.1.1", - "codespan-reporting", - "indexmap 2.2.1", - "log", - "naga", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.4.2", - "block", - "cfg_aliases 0.1.1", - "core-graphics-types", - "d3d12", - "glow", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.0", - "log", - "metal", - "naga", - "objc", - "once_cell", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" -dependencies = [ - "bitflags 2.4.2", - "js-sys", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -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 = "window_clipboard" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a197337269a469b5b2583d65dd7dfe475fd79a525be0aa647ff6d37ac6612c" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle", - "thiserror", -] - -[[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.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-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-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.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-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -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", -] - -[[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_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[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_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.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_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[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_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.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_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" -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_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.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 = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winit" -version = "0.29.10" -source = "git+https://github.com/iced-rs/winit.git?rev=b91e39ece2c0d378c3b80da7f3ab50e17bb798a5#b91e39ece2c0d378c3b80da7f3ab50e17bb798a5" -dependencies = [ - "ahash 0.8.7", - "android-activity", - "atomic-waker", - "bitflags 2.4.2", - "bytemuck", - "calloop", - "cfg_aliases 0.1.1", - "core-foundation", - "core-graphics", - "cursor-icon", - "icrate", - "js-sys", - "libc", - "log", - "memmap2 0.9.4", - "ndk", - "ndk-sys", - "objc2", - "once_cell", - "orbclient", - "percent-encoding", - "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.30", - "sctk-adwaita", - "smithay-client-toolkit 0.18.0", - "smol_str", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.48.0", - "x11-dl", - "x11rb 0.13.0", - "xkbcommon-dl", -] - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if", - "winapi", -] - -[[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.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname 0.2.3", - "nix 0.22.3", - "winapi", - "winapi-wsapoll", -] - -[[package]] -name = "x11rb" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" -dependencies = [ - "as-raw-xcb-connection", - "gethostname 0.4.3", - "libc", - "libloading 0.8.0", - "once_cell", - "rustix 0.38.30", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[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", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" -dependencies = [ - "bitflags 2.4.2", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" - -[[package]] -name = "xml-rs" -version = "0.8.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8f380ae16a37b30e6a2cf67040608071384b1450c189e61bea3ff57cde922d" - -[[package]] -name = "xxhash-rust" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" - -[[package]] -name = "yazi" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" - -[[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 0.26.2", - "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 = "zeno" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "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.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.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/networking/irc/halloy/default.nix b/pkgs/applications/networking/irc/halloy/default.nix deleted file mode 100644 index 2758914f73cc6..0000000000000 --- a/pkgs/applications/networking/irc/halloy/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, copyDesktopItems -, makeDesktopItem -, libxkbcommon -, openssl -, pkg-config -, rustPlatform -, vulkan-loader -, wayland -, xorg -}: - -rustPlatform.buildRustPackage rec { - pname = "halloy"; - version = "2024.3"; - - src = fetchFromGitHub { - owner = "squidowl"; - repo = "halloy"; - rev = "refs/tags/${version}"; - hash = "sha256-9yEkM65c8R71oQ0C54xZqwRh609+HSaq4Hb8izNM52A="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "iced-0.12.0" = "sha256-LtmAJDUMp42S4E+CjOM6Q7doAKOZkmJCN/49gsq3v/A="; - "winit-0.29.10" = "sha256-YoXJEvEhMvk3pK5EbXceVFeJEJLL6KTjiw0kBJxgHIE="; - }; - }; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - ]; - - buildInputs = [ - libxkbcommon - openssl - vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Cocoa - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Metal - darwin.apple_sdk.frameworks.QuartzCore - darwin.apple_sdk.frameworks.Security - ] ++ lib.optionals stdenv.isLinux [ - wayland - ]; - - desktopItems = [ - (makeDesktopItem { - name = "org.squidowl.halloy"; - desktopName = "Halloy"; - comment = "IRC client written in Rust"; - icon = "org.squidowl.halloy"; - exec = pname; - terminal = false; - mimeTypes = [ "x-scheme-handler/irc" "x-scheme-handler/ircs" ]; - categories = [ "Network" "IRCClient" ]; - keywords = [ "IM" "Chat" ]; - startupWMClass = "org.squidowl.halloy"; - }) - ]; - - postFixup = lib.optional stdenv.isLinux ( - let - rpathWayland = lib.makeLibraryPath [ wayland vulkan-loader libxkbcommon ]; - in - '' - rpath=$(patchelf --print-rpath $out/bin/halloy) - patchelf --set-rpath "$rpath:${rpathWayland}" $out/bin/halloy - ''); - - postInstall = '' - install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png - ''; - - meta = with lib; { - description = "IRC application"; - homepage = "https://github.com/squidowl/halloy"; - changelog = "https://github.com/squidowl/halloy/blob/${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; - mainProgram = "halloy"; - }; -} diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index eff1458e07e34..1078f515c69ac 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -4,7 +4,7 @@ , fetchYarnDeps , nodejs , yarn -, fixup_yarn_lock +, fixup-yarn-lock , python3 , npmHooks , darwin @@ -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 darwin.cctools; buildInputs = [ sqlite ]; configurePhase = '' @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { export HOME="$PWD" - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 6eecadf97d321..9c34197fdbf55 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.2.1"; + version = "4.2.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-JT3fCG9shFAxot0pSxVShR1rBMwIovnaSu37Pi+Rvc0="; + hash = "sha256-IJaLIsfw9Q35z2/4WY3RvQF8V1myyUWT9dnteyTruUE="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index ac525fd2fa11a..52e2f0d47c773 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.11.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-b3XpKAV/K+69tQmjM1CGzoOTcaQHB6q3gpoSa/YFwak="; + hash = "sha256-r4sE/1RI/Y6gDMApwlr4Gf6Jvl0zNCAahduXyRtFboE="; }; - cargoHash = "sha256-dnEEque40qi7vuUxY/UDZ5Kz8LTuz0GvYVjTxl8eMvI="; + cargoHash = "sha256-N9MsYz7QTm04k5eMdwqj4wTQ36SoaJBqvsty58Pg8tU="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index 2b0e870ed4850..8e5e9abb0fb46 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -8,31 +8,33 @@ , go , wrapQtAppsHook , qtbase -, qtquickcontrols2 +, qtdeclarative +, qtsvg , kconfig , kcoreaddons , kguiaddons , ki18n -, kirigami2 +, kirigami , kirigami-addons , knotifications +, nlohmann_json }: let - version = "0.9.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc="; + hash = "sha256-fIx6XfNGK+jDpeaoCzTKwv3J01yWoHOgWxjbwTGVK1U="; }; goDeps = (buildGoModule { pname = "tailwrap"; inherit src version; modRoot = "tailwrap"; - vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE="; + vendorHash = "sha256-egTzSdOKrhdEBKarIfROxZUsxbnR9F1JDbdoKzGf9UM="; }).goModules; in stdenv.mkDerivation { @@ -63,14 +65,15 @@ stdenv.mkDerivation { buildInputs = [ qtbase - qtquickcontrols2 + qtdeclarative + qtsvg kconfig kcoreaddons kguiaddons ki18n - kirigami2 - kirigami-addons + kirigami knotifications + nlohmann_json ]; meta = with lib; { diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index 6bff0e0fbc6cd..3854b347c0614 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -7,6 +7,7 @@ , pkg-config , libayatana-appindicator , undmg +, makeBinaryWrapper }: let @@ -72,13 +73,14 @@ let hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg="; }; - nativeBuildInputs = [ undmg ]; + 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 // { diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 51fde794a1c8b..195fdc8556420 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.8.0"; + version = "1.9.2"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw="; + hash = "sha256-dgiVSwCTNDncbPJ+f0grjtq822TvtG0PhC9gDOKhwRI="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 2c776a05d0539..003b07d2d5f6f 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-rycAGqZhO48bPTFO2y2J1d16oon24sEEUns4EayWDvg="; + vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo="; nativeBuildInputs = [ scdoc diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 6ca7c348969f4..b62b30ae60b36 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.6.0"; + version = "115.9.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb21-correct-series-take2"; + rev = "${version}-bb26-build2"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-YERSRyLfFTexvAYmP9qG6joQkK5fSIvU4pNLhCyIbOY="; + hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -50,7 +50,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-Oxz5drDQ9IJVpgP4/+jiQ5Ds1b0oX8TRD+SOG6JRN0Q="; + hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -65,8 +65,8 @@ in ((buildMozillaMach { cd $patches # fix FHS paths to libdbusmenu substituteInPlace 12-feature-linux-systray.patch \ - --replace "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ - --replace "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" + --replace-fail "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ + --replace-fail "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" cd - chmod -R +w dom/base/test/gtest/ @@ -78,6 +78,11 @@ in ((buildMozillaMach { continue fi + # requires vendored icu, fails to link with our icu + if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then + continue + fi + echo Applying patch $patch. if [[ $patch == *-m-c.patch ]]; then git apply -p1 -v < $patches/$patch diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix deleted file mode 100644 index 7ab696685b52e..0000000000000 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, pkg-config -, AppKit -, Cocoa -, Security -, installShellFiles -, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform -, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform -, notmuch -, gpgme -, buildNoDefaultFeatures ? false -, buildFeatures ? [] -}: - -rustPlatform.buildRustPackage rec { - inherit buildNoDefaultFeatures buildFeatures; - - pname = "himalaya"; - version = "1.0.0-beta.3"; - - src = fetchFromGitHub { - owner = "soywod"; - repo = pname; - rev = "v${version}"; - hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk="; - }; - - cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8="; - - nativeBuildInputs = [ ] - ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config - ++ lib.optional (installManPages || installShellCompletions) installShellFiles; - - buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ] - ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch - ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; - - postInstall = lib.optionalString installManPages '' - mkdir -p $out/man - $out/bin/himalaya man $out/man - installManPage $out/man/* - '' + lib.optionalString installShellCompletions '' - installShellCompletion --cmd himalaya \ - --bash <($out/bin/himalaya completion bash) \ - --fish <($out/bin/himalaya completion fish) \ - --zsh <($out/bin/himalaya completion zsh) - ''; - - meta = with lib; { - description = "CLI to manage emails"; - mainProgram = "himalaya"; - homepage = "https://pimalaya.org/himalaya/cli/latest/"; - changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ soywod toastal yanganto ]; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index dfe749d7d0bd0..5a55476d4b9e4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.8.1"; + version = "115.10.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "4d28f865f482a0d4c91f26ef26709a00f78955699b4ca191f960bcdb8d2c0c95c2a8e8782129d5660e192c605cba021fac553b13868861086a608f0c50aa5da7"; + sha512 = "0324811d3e7e6228bb45cbf01e8a4a08b8386e22d1b52eb79f9a9a3bda940eb9d534ec1230961e9a998a0162c299a1ad49d23c5fbfa8e287896bcc0fd1c398e0"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 141a6f4835181..7e0430c1cd82c 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 = "218.240227.0"; + version = "220.240321.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-Ks046Z2jycOb63q3g16nJrHpaH0FJH+c+ZGTldfHllI="; + hash = "sha256-LbvldnhvKHvBEaOwkxA2acuUKMcYi16ceYPuMW73qLs="; }; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index ac02ca8f64c17..f4313187636c3 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "mhost"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "lukaspustina"; repo = pname; rev = "v${version}"; - sha256 = "1j0378f8gj8hdcdhpj6lqlnriasmjxzri42wjj9pygzkmpd3ym86"; + sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; }; - cargoSha256 = "0gqrya0bpdd67k2sxib7f4npnrx84d9r4hjq2sg2xz4j8pmgs018"; + cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; CARGO_CRATE_NAME = "mhost"; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 2aa8add652b17..6c3f30266e146 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2023.6"; + version = "2024.1"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-IhE93NXX8iwlvso+ei9wbVyJJLtkjrZf8qB43AZre+4="; - aarch64-linux = "sha256-HRAGDps0Cf7qOWTS7die9uouxMpAaM83t1Ixz7ElF6g="; + x86_64-linux = "sha256-io6ROUHoSBij1ah6yi1Gbni6yWVVoYZKUd7BR+GXKLg="; + aarch64-linux = "sha256-bzKTASfqjmjyKZecr8MGaChd6g48aQhfpuc+gUqwoPI="; }; in diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index 391a7179b7a9e..9cbf256ce7f66 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/pkgs/applications/networking/mullvad/Cargo.lock @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -134,12 +134,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -167,6 +167,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "async-recursion" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -437,9 +448,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.2" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -447,9 +458,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -459,18 +470,18 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.1" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4110a1e6af615a9e6d0a36f805d5c99099f8bab9b8042f5bc1fa220a4a89e36f" +checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -480,9 +491,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "classic-mceliece-rust" @@ -1166,9 +1177,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1176,7 +1187,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.0.0", "slab", "tokio", "tokio-util", @@ -1214,6 +1225,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.0" +source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +dependencies = [ + "async-recursion", + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.5.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "serde", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.24.0" +source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "serde", + "smallvec", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "hickory-server" +version = "0.24.0" +source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +dependencies = [ + "async-trait", + "bytes", + "cfg-if", + "enum-as-inner", + "futures-util", + "hickory-proto", + "hickory-resolver", + "ipnet", + "prefix-trie", + "serde", + "thiserror", + "time", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] name = "hkdf" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1380,6 +1459,16 @@ 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 = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1470,6 +1559,9 @@ name = "ipnet" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +dependencies = [ + "serde", +] [[package]] name = "ipnetwork" @@ -1817,7 +1909,7 @@ dependencies = [ "chrono", "clap", "clap_complete", - "env_logger 0.10.0", + "err-derive", "futures", "itertools", "mullvad-management-interface", @@ -2574,6 +2666,16 @@ dependencies = [ ] [[package]] +name = "prefix-trie" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85fe48f29e6e6fcf123d0d03d63028dbe4c4a738023d35d525df4882f4929418" +dependencies = [ + "ipnet", + "num-traits", +] + +[[package]] name = "prettyplease" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3197,7 +3299,7 @@ dependencies = [ "cfg-if", "futures", "hyper", - "idna", + "idna 0.4.0", "ipnet", "iprange", "json5", @@ -3433,6 +3535,8 @@ dependencies = [ "duct", "err-derive", "futures", + "hickory-proto", + "hickory-server", "inotify 0.10.2", "ipnetwork", "jnix", @@ -3618,6 +3722,7 @@ dependencies = [ "err-derive", "ipnetwork", "jnix", + "log", "serde", "x25519-dalek", "zeroize", @@ -3839,9 +3944,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4030,7 +4135,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.4.0", "ipnet", "once_cell", "rand 0.8.5", @@ -4201,7 +4306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", "serde", ] @@ -4411,6 +4516,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.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4441,6 +4555,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +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", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4453,6 +4582,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4465,6 +4600,12 @@ 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" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4477,6 +4618,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4489,6 +4636,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4501,6 +4654,12 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4513,6 +4672,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4525,6 +4690,12 @@ 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" + +[[package]] name = "winnow" version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index ab8565b5811ce..c14675013cbf4 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -13,7 +13,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorHash = "sha256-MQ5tVbcwMee6lmPyKSsNBh9jrz4zwx7INf1Cb0GxjHo="; + vendorHash = "sha256-2hb6+OHifm/oAgXCiYf+nwtNDDZNWR6lAbLSGT3AG0I="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work @@ -23,13 +23,6 @@ buildGoModule { ldflags = [ "-s" "-w" "-buildmode=c-archive" ]; patches = [ - # build broken without wintun reference - # https://github.com/mullvad/mullvadvpn-app/pull/5621 - (fetchpatch { - url = "https://github.com/mullvad/mullvadvpn-app/commit/5dff68ac9c8ec26f1a39a7f44e3b684bb0833bf1.patch"; - hash = "sha256-bUcDVmrrDblK7OJvHqf627vzVwmmvO2EL+sioAnZGbk="; - relative = "wireguard/libwg"; - }) ]; postInstall = '' diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index c36952c9c178b..22ff976829295 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -17,13 +17,13 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2023.6"; + version = "2024.1"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-O4YnHwG5GUDR7MzGsuLnElcczEct+P+4/Vn/eAoo6/s="; + hash = "sha256-syIBYZe+e6i5A6Te51eNKcwwycnRhO1o2tP+z81NYXQ="; }; cargoLock = { @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk="; "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; + "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg="; }; }; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 1ba63841ce5f9..ab10d4add74d0 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -51,7 +51,7 @@ let mainProgram = "mumble-server"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ infinisil felixsinger ]; + maintainers = with maintainers; [ felixsinger lilacious ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 24e2585a24dbd..eb9b5ad3af95e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "pan"; - version = "0.155"; + version = "0.157"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = "v${version}"; - hash = "sha256-DsoTqZLcZOc3HlpCC8rmu/rcFeHkb9IWd4PSLwxKqJI="; + hash = "sha256-+zzAnppP6ICIhhlqXGVF4h/yIDa6oE1lxenmzcr2BQo="; }; nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a6f0cf62b5037..a6d88fc686b0f 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.12.1"; + version = "3.12.3"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-WGmabfOuEs9WRq1Ta7ZiZQuscoEdxhaFhuppE7MpZfk="; + hash = "sha256-ScWkEOx2tHoCQbFwBvJQgk2YoYOTPi3PrVsaDNJBEUI="; }; patches = [ diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 9b184a8fa13d9..3d675d04d58f7 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -29,12 +29,12 @@ }: let - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-LR3Ao4Q8kEDwrFV+gYdMSEeYF4hDtEa1rJgvRRrJMwc="; + hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 27476d3b48a78..3f5e2f7c58a23 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.20.0"; + version = "0.21.1"; src = fetchurl { - url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-VgKeeKmcBNUrE1gJSuUHTkzY6puYz2hV9XrZryeslRg="; + url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz"; + hash = "sha256-k+aLPqynCHJz49doX+auOLLoBV5MnnANNg3UBVJJeFw="; }; enableParallelBuilding = true; @@ -34,10 +34,6 @@ stdenv.mkDerivation rec { # builds. find . \( -iname \*test\*.c -or -name \*.conf \) | \ xargs sed -ie "s|/tmp|$TMPDIR|g" - - sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \ - src/regex/Makefile.in \ - src/fs/Makefile.in ''; # unfortunately, there's still a few failures with impure tests diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 94504f2b99563..640ffeef75880 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-6ZHlDIKrTmr/aRz4k5FtRVxZ7B9Hlh2w42QT4YRsVi0="; + url = "mirror://gnu/gnunet/gnunet-gtk-${version}.tar.gz"; + hash = "sha256-vQFtKFI57YG64WpKVngx1kq687hI+f1kpP9ooK53/aw="; }; nativeBuildInputs= [ diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index a51dba890a40b..6c09ae892e27a 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -36,9 +36,11 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { + # Build fails with Go >=1.21, couldn't be fixed by updating module dependencies. + broken = true; description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; - homepage = "https://github.com/boramalper/magnetico"; - license = licenses.agpl3; + homepage = "https://github.com/ireun/magnetico"; + license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 05006aec3e937..672a0c79fb04b 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-4RVJ7xQY9zcB8+RUr80P9xKUXGxt0ATSzYmRDfZIowU="; + hash = "sha256-98iE+VM32eq56eB4B0KNrj8+DbmRSsyAb7eMlprSsjs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 418c4f243a007..124a1d40f3b31 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -35,10 +35,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; - env = lib.optionalAttrs (stdenv.cc.libcxx != null) { - # work around https://github.com/NixOS/nixpkgs/issues/166205 - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - } // lib.optionalAttrs stdenv.cc.isClang { + env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 1414543d4cc40..8b04fc7e3f492 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-osQIx67KWEraVlB+J6HmC44uDTF1HKUytBS6eilp4jI="; + hash = "sha256-xjpySIbt7f86PRR/9F1DXMc0G+pBq3/75STW6Zw6IhE="; }; - vendorHash = "sha256-5XU/qyYdk8nufyQbyjkjUEWzt+RTVYzsdyKU77qrgHc="; + vendorHash = "sha256-cgQcI6yrnc5BUuyOkaYu24GzCaGe+BgXOC2zdt1Z1Lg="; nativeBuildInputs = [ pkg-config ]; @@ -37,17 +37,14 @@ buildGoModule rec { postInstall = '' mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge # The cli is named like that in other distro packages - install -Dm444 dist/proton-bridge.desktop -t $out/share/applications - install -Dm444 dist/bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg ''; - meta = with lib; { - homepage = "https://github.com/ProtonMail/proton-bridge"; + meta = { changelog = "https://github.com/ProtonMail/proton-bridge/blob/${src.rev}/Changelog.md"; - downloadPage = "https://github.com/ProtonMail/proton-bridge/releases"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ mrfreezeex ]; description = "Use your ProtonMail account with your local e-mail client"; + downloadPage = "https://github.com/ProtonMail/proton-bridge/releases"; + homepage = "https://github.com/ProtonMail/proton-bridge"; + license = lib.licenses.gpl3Plus; longDescription = '' An application that runs on your computer in the background and seamlessly encrypts and decrypts your mail as it enters and leaves your computer. @@ -55,5 +52,6 @@ buildGoModule rec { To work, use secret-service freedesktop.org API (e.g. Gnome keyring) or pass. ''; mainProgram = "protonmail-bridge"; + maintainers = with lib.maintainers; [ mrfreezeex daniel-fahey ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index e273a3242739d..2930ef450ea25 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -27,14 +27,14 @@ buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.1.10"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-D06dMMjzFE7gIGFpIH/+0xmVCckqAWLkb3lc2ZmxNZs="; + hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 5155e29a0bda5..08e428b18b07a 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -7,14 +7,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; - hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; + hash = "sha256-qVksva6+EfAQiOexP8NlDSCR5Ab2WGsuCG4BD87rlag="; }; buildInputs = [ diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix deleted file mode 100644 index b1e11510530a3..0000000000000 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, lib -, makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16, libva, libusb1, hiredis, xcbutil -}: - -stdenv.mkDerivation rec { - pname = "aws-workspaces"; - version = "4.6.0.4187"; - - src = fetchurl { - # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/Packages - urls = [ - "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/focal/main/binary-amd64/workspacesclient_${version}_amd64.deb" - "https://archive.org/download/workspacesclient_${version}_amd64/workspacesclient_${version}_amd64.deb" - ]; - sha256 = "sha256-A+b79ewh4hBIf8jgK0INILFktTqRRpOgXRH0FGziV6c="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; - - # Crashes at startup when stripping: - # "Failed to create CoreCLR, HRESULT: 0x80004005" - dontStrip = true; - - buildInputs = [ - stdenv.cc.cc.lib - libkrb5 - curl - lttng-ust - libpulseaudio - gtk3 - openssl_1_1.out - icu70 - webkitgtk - librsvg - gdk-pixbuf - libsoup - glib-networking - graphicsmagick_q16 - hiredis - libusb1 - libva - xcbutil - ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg -x $src $out - ''; - - preFixup = '' - patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so - patchelf --replace-needed libGraphicsMagick++-Q16.so.12 libGraphicsMagick++.so.12 $out/usr/lib/x86_64-linux-gnu/pcoip-client/vchan_plugins/libvchan-plugin-clipboard.so - patchelf --replace-needed libhiredis.so.0.14 libhiredis.so $out/lib/libpcoip_core.so - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib - mv $out/opt/workspacesclient/* $out/lib - rm -rf $out/opt - - wrapProgram $out/lib/workspacesclient \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ - --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ - --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules" - - mv $out/lib/workspacesclient $out/bin - ''; - - meta = with lib; { - description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; - homepage = "https://clients.amazonworkspaces.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; # TODO Mac support - maintainers = with maintainers; [ mausch dylanmtaylor ]; - }; -} diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index ec44f3da04934..f751f3237e412 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, libcxxabi, libcxx, e2fsprogs, symlinkJoin +, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, e2fsprogs, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 @@ -96,7 +96,6 @@ stdenv.mkDerivation rec { libcap libcanberra-gtk3 libcxx - libcxxabi libinput libjpeg libjson diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 512a396fd0b76..df95f5b9d6f74 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - version = "0.80"; + version = "0.81"; pname = "putty"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-IBPIOnIbF1NSnpCQ98ODDo/kyAoHDMznZFObrbP2cIE="; + hash = "sha256-y4sAqU9FNJTjRaPfKB16PtJrsN1+NiZPFFIG+IV2Of4="; }; nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 759388cbd4253..82a98c0579c7c 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,5 +1,6 @@ { mkDerivation , lib +, stdenv , fetchurl , autoPatchelfHook , makeWrapper @@ -8,6 +9,7 @@ , qtbase , qtwebengine , qtx11extras +, qtquickcontrols2 , getconf , glibc , libXrandr @@ -26,12 +28,22 @@ mkDerivation rec { pname = "teamviewer"; # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime outputs = [ "out" "dev" ]; - version = "15.38.3"; - - src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-+GGpGV8rl15VQvPRA2PWngQI4VoxCrZ0ArEm9FgdOVE="; - }; + version = "15.49.2"; + + src = + let + base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x"; + in + { + x86_64-linux = fetchurl { + url = "${base_url}/teamviewer_${version}_amd64.deb"; + sha256 = "sha256-Ag41RQD4lp4Sxuz6wZwiFzVxUalV+M3Zwa2Cug4iNSM="; + }; + aarch64-linux = fetchurl { + url = "${base_url}/teamviewer_${version}_arm64.deb"; + sha256 = "sha256-JGSmFq4q8TQJVIrS6qQxIxZPNKgor+pFetextLJPHtg="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); unpackPhase = '' ar x $src @@ -39,7 +51,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ qtbase qtwebengine qtx11extras icu63 ]; + buildInputs = [ qtbase qtwebengine qtx11extras qtquickcontrols2 icu63 ]; installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index ced76131e45b9..da92226507eeb 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -11,7 +11,7 @@ , configText ? "" }: let - version = "2312"; + version = "2312.1"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -36,8 +36,8 @@ let pname = "vmware-horizon-files"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/CART24FQ4_LIN_2312_TARBALL/VMware-Horizon-Client-Linux-2312-8.12.0-23149323.tar.gz"; - sha256 = "15ca1d6028b9ca88e23fa363a2942fd76456c19e95ced4734595c3dc44db38d8"; + url = "https://download3.vmware.com/software/CART25FQ1_LIN_2312.1_TARBALL/VMware-Horizon-Client-Linux-2312.1-8.12.1-23543969.tar.gz"; + sha256 = "23d18be2955ba60ab3cca941a529fa3b804af97ebf1602d246ca6147cced8135"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 306f31f0628d4..8924006e81efa 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - hash = "sha256-1VLPnP4BmF9Zha0uVsPjA/WbF/oLfZmdDX57SzqrV5A="; + hash = "sha256-zk5IzZiFff9EeJn24/QmE1ybcBkxpaz6Owp77CfCwV0="; }; strictDeps = true; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ mic92 ]; mainProgram = "waypipe"; }; } diff --git a/pkgs/applications/networking/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 8f78701fb9e5e..08c5243414dac 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-LTCr1OFh+1QQhXFNl9SoLPqEY0ERlLlWfSxRKjyyqPk="; + hash = "sha256-PMCetU+E0Kl50K7sJB6UiHVouWPtfW8ALXFacxCvAhE="; }; - vendorHash = "sha256-twXeLNWy/5wTaFb645mCeI5PzByEGj5aCWl6vO+qRLQ="; + vendorHash = "sha256-RsmwTRVjhEgKAT9aekSfkRuai2165KG7q5aFjAiLSPU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 8ffadab3ed44c..c042167623f71 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9ccp5Pxhs7jOQuWHCmU9yvzLKeOAN8lEaieCIvnXJRA="; + sha256 = "sha256-EbB5Ok/8RUoNzkgoWIhHTRvlq9Vv2KVx6Hu8ejrLkMc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index f9ec3d21f6e96..d91b2540f7645 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -54,7 +54,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.3"; + version = "4.2.4"; outputs = [ "out" "dev" ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-2kJBVO40F1m43317g337bk84ZSf6WPK04ir0xc5qxTc="; + hash = "sha256-yGKqklNy1SkmWOaYI0jsTy2rLq5W/dbh8fIUrBSSdw8="; }; patches = [ diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index 6142aa3898e2a..def0f5900ba19 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; rev = "refs/tags/v${version}"; - hash = "sha256-wIyPb1RxvjkGu3Gs69HyL1WuLZUIFWB8URJjkz3oar0="; + hash = "sha256-3OvzMzlaSwT7fOJATi+2QsSWln+SLkXNr2kYlQGClwA="; }; - cargoHash = "sha256-iB8KL0ad+rI4HuZLgb7KqfrUBTQuKRWjqaa6BnHU5eg="; + cargoHash = "sha256-PdlST5n8YaKkByPOvFAg5CqRxVkqRgLeVHW6CJOKioY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 9e1f59f0bed63..75776f02150b4 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -46,7 +46,7 @@ in sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship. ''; homepage = "https://www.scuttlebutt.nz/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ asymmetric picnoir cyplo ]; mainProgram = "ssb-patchwork"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 059716277032e..0a1a1d05dde4a 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.3"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; + sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; }; nativeBuildInputs = [ makeWrapper gettext ]; @@ -21,6 +21,8 @@ in stdenv.mkDerivation rec { installFlags = [ "DEST=$(out)" ]; + configureFlags = [ "--python=${lib.getExe python'}" ]; + preConfigure = '' cd common substituteInPlace configure \ @@ -41,7 +43,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; license = lib.licenses.gpl2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ stephen-huan ]; platforms = lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index bd571b1aed356..1580a51151a2b 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -11,11 +11,11 @@ mkDerivation { buildInputs = [ python' backintime-common ]; + configureFlags = [ "--python=${lib.getExe python'}" ]; + preConfigure = '' cd qt - substituteInPlace configure \ - --replace '"/../etc' '"/etc' - substituteInPlace qttools.py \ + substituteInPlace qttools_path.py \ --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' ''; @@ -37,7 +37,6 @@ mkDerivation { --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ - --replace "/usr/bin/python3" "${lib.getBin python'}/bin/python3" \ --replace "/usr/share/backintime" "$out/share/backintime" substituteInPlace "$out/bin/backintime-qt_polkit" \ diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 0d8b3d78ec05d..8fb607979100d 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -54,6 +54,10 @@ 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" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 6b5b78d31fedb..d521080460920 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.100.2"; + version = "1.102.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-wc6oK1zn04/1nwis9ndpkQc8dwY/J85zZbhkwmNFLek="; + hash = "sha256-GpHX34iHKeoT7AuEf76QTpTIrATLZyAoUxMoIouhvyA="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-84PI1tZFiodnGvMwObELVxXMCgIWINOrO0ISAWRnxRM="; + vendorHash = "sha256-atIb/SmOShLIhvEsTcegX7+xoDXN+SI5a7TQrXpqdUg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 89c7147310dca..70c395066107d 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.4"; + version = "1.27.6"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-TXkZJAN72Qa3Mo2TYvCHNOl3BWfRxu78XXHW48Jjj0M="; + hash = "sha256-BZAje6dA3wmJ6feHWIYPPYTA3sp1WGwl4MjUJS7iZCo="; }; - vendorHash = "sha256-ALdmETpEmvA3bTfBRK6LaO7bnlH03fljX1P7rqzskG4="; + vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 7d3efef57de9d..172e5bfb669a4 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, writeScript, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango, libxcb }: let pname = "synology-drive-client"; - baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.3.0-15082"; + baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; + version = "3.5.0-16084"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -10,7 +10,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "synology-drive"; }; passthru.updateScript = writeScript "update-synology-drive-client" '' @@ -29,8 +29,8 @@ let inherit pname version meta passthru; src = fetchurl { - url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-ha3KRpEIT7w6pUVUwZV011W1F/v/hNq9f3ArfzU0ZGc="; + url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; + sha256 = "sha256-Spl6DC+wf+JaXjwH2ecraySo1VtA+EiI3/TWw9UOSA8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -60,7 +60,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-dxmpB31ZjO1uAnAbY13OjVR81CCDLf9vJC20iZaPZJ4="; + sha256 = "sha256-NDYxUhWtAVUtpCf1WemqShZCFHGgLGwrkX6HldxOlH0="; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index c1de12fb94275..babdff54f1856 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd , qrencode, libsodium, libtool, libunistring, pkg-config, postgresql -, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo +, autoreconfHook, python3, recutils, wget, jq, gettext, texinfo }: let - version = "0.9.3"; + version = "0.10.1"; taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${version}"; - sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ="; + hash = "sha256-sgiJd1snN9JDqS7IUeORKL60Gcm7XwL/JCX3sNRDTdY="; }; taler-exchange = stdenv.mkDerivation { @@ -20,7 +20,7 @@ let url = "https://git.taler.net/exchange.git"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs="; + hash = "sha256-SKnMep8bMQaJt4r3u0SrzwYSuFbzv4RnflbutSqwtPg="; # When fetching submodules without the .git folder we get the following error: # "Server does not allow request for unadvertised object" @@ -45,14 +45,20 @@ let gettext texinfo # Fix 'makeinfo' is missing on your system. libunistring - python39.pkgs.jinja2 + python3.pkgs.jinja2 # jq is necessary for some tests and is checked by configure script jq ]; propagatedBuildInputs = [ gnunet ]; - preConfigure = '' + # From ./bootstrap + preAutoreconf = '' ./contrib/gana-generate.sh + pushd contrib + find wallet-core/aml-backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + popd ''; enableParallelBuilding = true; @@ -87,7 +93,7 @@ let url = "https://git.taler.net/merchant.git"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-HewCqyO/7nnIQY9Tgva0k1nTk2LuwLyGK/UUxvx9BG0="; + hash = "sha256-8VpoyloLpd/HckSIRU6IclWUXQyEHqlcNdoJI9U3t0Y="; }; postUnpack = '' ln -s ${taler-wallet-core}/spa.html $sourceRoot/contrib/ @@ -104,11 +110,11 @@ let # From ./bootstrap preAutoreconf = '' - cd contrib + pushd contrib find wallet-core/backoffice/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext truncate -s -2 Makefile.am.ext cat Makefile.am.in Makefile.am.ext >> Makefile.am - cd .. + popd ''; configureFlags = [ "--with-gnunet=${gnunet}" diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 023b72b88837e..33c7666fcf4e4 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.10.4"; + version = "0.11.2"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-/31QKCyMeEdpP59B+iXS5hL9W5sWz7R/I2nxBtj+0s4="; + hash = "sha256-Og/ilxWNB5TNqnViZ5TeE0P+RxG1JOP2q9jo91SBNZQ="; }; - vendorHash = "sha256-xYBiO6Zm32Do19I/cm4T6fubXY++Bhkn+RNAmKzM5cY="; + vendorHash = "sha256-eIakjEYfVp2wfXu0oqBmd5hJZTp0xgYKNNbtpRBnT2w="; subPackages = [ "cmd/trayscale" ]; @@ -46,10 +46,11 @@ buildGoModule rec { ''; meta = with lib; { + changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${version}"; description = "An unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; - maintainers = with maintainers; [ k900 ]; + maintainers = with maintainers; [ patka ]; mainProgram = "trayscale"; }; } diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index c8e218a3fdffa..9537ab4c17846 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2024.63.115357"; + version = "2024.98.119300"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-VSm9gnHfo9LPwUvNwLeX7OjqMYgFUgGYSxx/qDndfwo="; + hash = "sha256-N0cabYHaF5H1EeriQRQL7bN5UM85oOGrm9pxGr1AlEk="; }; buildInputs = [ diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/applications/networking/twtxt/default.nix index eb216b1df8612..bee27ef2a7436 100644 --- a/pkgs/applications/networking/twtxt/default.nix +++ b/pkgs/applications/networking/twtxt/default.nix @@ -1,36 +1,44 @@ -{ lib, fetchFromGitHub, buildPythonApplication, aiohttp, python-dateutil, humanize, click, pytestCheckHook, tox }: +{ + lib, + fetchFromGitHub, + python3, +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "twtxt"; version = "1.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "buckket"; - repo = pname; + repo = "twtxt"; rev = "refs/tags/v${version}"; sha256 = "sha256-CbFh1o2Ijinfb8X+h1GP3Tp+8D0D3/Czt/Uatd1B4cw="; }; - # Relax some dependencies - postPatch = '' - substituteInPlace setup.py \ - --replace 'aiohttp>=2.2.5,<3' 'aiohttp' \ - --replace 'click>=6.7,<7' 'click' \ - --replace 'humanize>=0.5.1,<1' 'humanize' - ''; + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; + dependencies = with python3.pkgs; [ + aiohttp + click + humanize + python-dateutil + setuptools + ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - nativeCheckInputs = [ pytestCheckHook tox ]; + pythonImportsCheck = [ "twtxt" ]; disabledTests = [ - # Disable test using relative date and time - "test_tweet_relative_datetime" + # Disable test using relative date and time + "test_tweet_relative_datetime" ]; meta = with lib; { description = "Decentralised, minimalist microblogging service for hackers"; homepage = "https://github.com/buckket/twtxt"; + changelog = "https://github.com/buckket/twtxt/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; mainProgram = "twtxt"; diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 54e688c2e770d..52994f63e18c9 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; mainProgram = "warp"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index e117e6e4a54c1..9798ca2283305 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-5AxEkGmThLEEw1XGrWuabRcVgYH8OT2cXxyeFrYeBOI="; + x86_64-linux = "sha256-s/1XyEXOyvAQNf32ckKotQ4jYdlo/Y+O9PY3wIUs80A="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "8.3"; + version = "8.6"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 2438673359553..1712c6f4fe5cd 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -37,7 +37,7 @@ in description = "Request backlog for IRC channels."; homepage = "https://github.com/fruitiex/znc-backlog/"; license = licenses.asl20; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; }; }; @@ -57,7 +57,7 @@ in description = "ZNC module for client specific buffers"; homepage = "https://github.com/CyberShadow/znc-clientbuffer"; license = licenses.asl20; - maintainers = with maintainers; [ hrdinka szlend ]; + maintainers = with maintainers; [ hrdinka szlend cybershadow ]; }; }; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 046e1273ed1bb..ec0cd9534b149 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.4.9"; + version = "0.5.4"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-+Olmp2z5cLDgZikY2n9LI2A9W03pYdCtUE9hdr9Tp2Q="; + hash = "sha256-gIM4CQvPkQIWvHXYPwr4yiDY1mUuOmubdqkOmHNssVo="; stripRoot = false; }; diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 947c9946e5d3f..c3e080ad3d524 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modular multi screen pdf presentation viewer"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; - license = with licenses; [ agpl3 gpl3Plus ]; + license = with licenses; [ agpl3Only gpl3Plus ]; platforms = platforms.all; maintainers = with maintainers; [ pacien dotlambda ]; mainProgram = "beamerpresenter"; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index a321e65817611..1b02f3be80eca 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -120,11 +120,6 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' ''; - env = lib.optionalAttrs stdenv.cc.isClang { - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - # Some tests require networking doCheck = false; diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index 7a7aa8c1c9a15..e1f915075b970 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "johnfactotum"; - repo = pname; + repo = "foliate"; rev = "refs/tags/${version}"; - hash = "sha256-6cymAqQxHHoTgzEyUKXC7zV/lUEJfIG+54+tLsc9iHo="; + hash = "sha256-uKxybt8ZZuk2tWSJLKC7Tgw78EfMMgI99VExfgOdHwA="; fetchSubmodules = true; }; @@ -51,9 +51,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and modern GTK eBook reader"; - mainProgram = "foliate"; homepage = "https://johnfactotum.github.io/foliate"; + changelog = "https://github.com/johnfactotum/foliate/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ onny ]; + mainProgram = "foliate"; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index b7929dbf9e443..da94f9674ca28 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.5"; + version = "5.6"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-tNr2e7iStwYyP2Lp+pckIDnX3QouHhB3HgwlgX3Q7Ts="; + hash = "sha256-tLQsYmNQ8+effKHyFzVFzGPd7hrd8kYLGh8iIhvyG9E="; }; nativeBuildInputs = [ @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "Gnucash"; repo = "gnucash-docs"; rev = version; - hash = "sha256-ilDh4PH+tdrJReIpgvEd0Gvs8Xvt5Q43XM5r7Bn+5IM="; + hash = "sha256-rQZoau466Bi/YpPj1XpSsm67FgTYhiMfZfogTtn+m1k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index b44fc71c3d84f..2f3927146f801 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -12,6 +12,9 @@ , dconf , librsvg , gdk-pixbuf +# some scripts need these when used in conjuction with firejail +, coreutils +, gnugrep # Configuration options for the wrapper , extraMakeWrapperArgs ? [] , dbusVerify ? stdenv.isLinux @@ -32,6 +35,7 @@ let "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" "--prefix" "GST_PLUGIN_SYSTEM_PATH_1_0" ":" "${lib.makeSearchPath "lib/girepository-1.0" unwrapped.gst_packages}" + "--suffix" "PATH" ":" "${lib.makeBinPath [ coreutils gnugrep ]}" ] ++ lib.optionals unwrapped.kdeIntegration [ "--prefix" "QT_PLUGIN_PATH" ":" "${ lib.makeSearchPath diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2808dd14e2c62..03eee188ac565 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.110.2"; + version = "2.111.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-AJNNCPEwLAO1+Zub6Yyad5Zcsl35zf4dEboyGE9wSX8="; + hash = "sha256-tN76RKHETTMkJ239I6+a36RPTuWqYlCSs+tEP+BcB+M="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 41cae1da04e3b..a77655588464b 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace '/opt/Morgen' $out/bin makeWrapper ${electron}/bin/electron $out/bin/morgen \ - --add-flags $out/opt/Morgen/resources/app.asar + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer}} $out/opt/Morgen/resources/app.asar" runHook postInstall ''; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 367d4ebaf5b6c..554aeb588ef7b 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -5,6 +5,8 @@ , nixosTests , gettext , python3 +, giflib +, darwin , ghostscript , imagemagickBig , jbig2enc @@ -22,16 +24,35 @@ }: let - version = "2.6.2"; + version = "2.7.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-i7zQQbNF9uAmvC5qAlNKV8Ip9K6sM1xOeOV4wxe5hts="; + hash = "sha256-vXW2d45Mth3Y95xPPH8bFjVLWVdUl+WuvSXJyPD3FyU="; + }; + + # 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 { + 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; }; + + uvicorn = prev.uvicorn.overridePythonAttrs (_: { + version = "0.25.0"; + src = fetchFromGitHub { + owner = "encode"; + repo = "uvicorn"; + rev = "0.25.0"; + hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; + }; + }); + }; }; - python = python3; path = lib.makeBinPath [ ghostscript @@ -53,7 +74,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-oie1jUFIRrOpdxw1gDtLBgFl1Fb0F5hjvl0wTAd6eYU="; + npmDepsHash = "sha256-MJ5pnQChghZBfVN6Lbz6VcMtbe8QadiFLTsMF5TlebQ="; nativeBuildInputs = [ pkg-config @@ -64,6 +85,9 @@ let buildInputs = [ pango + ] ++ lib.optionals stdenv.isDarwin [ + giflib + darwin.apple_sdk.frameworks.CoreText ]; CYPRESS_INSTALL_BINARY = "0"; @@ -224,7 +248,7 @@ python.pkgs.buildPythonApplication rec { doCheck = !stdenv.isDarwin; passthru = { - inherit python path frontend; + inherit python path frontend tesseract5; nltkData = with nltk-data; [ punkt snowball_data stopwords ]; tests = { inherit (nixosTests) paperless; }; }; diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 08dd9eea9bbd6..5be76fa51685f 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -2,12 +2,11 @@ , coreutils , fetchFromGitHub , ghostscript -, glibc +, locale , gnome , gnused , lib , resholve -, xorg }: resholve.mkDerivation rec { @@ -35,15 +34,16 @@ resholve.mkDerivation rec { inputs = [ coreutils ghostscript - glibc + locale gnome.zenity gnused - xorg.xmessage ]; + fake = { + # only need xmessage if zenity is unavailable + external = [ "xmessage" ]; + }; execer = [ - "cannot:${glibc.bin}/bin/locale" "cannot:${gnome.zenity}/bin/zenity" - "cannot:${xorg.xmessage}/bin/xmessage" ]; keep."$toutLu" = true; }; @@ -54,5 +54,6 @@ resholve.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; mainProgram = "pdfmm"; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index c4a1ab0887d13..1f6ccbf10f487 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.5.2"; + version = "4.6"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-huHNcAIwTvKssPQmOGCc6UzPxCh7JP1gM6BGbD0QM/w="; + hash = "sha256-vyw8SjI8EM9giYpAsCNppgSydPEBNz2sbFahEKmKe6w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 7ef353dc1cd01..281273c218039 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.2"; + version = "0.68.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-h/WCfF3jK/pkN911vxPe2xzGUfVY2Xy+3yJwoqBQ5mA="; + hash = "sha256-7EQ/gKFflElga5LDwAkjPcqNl6HNtnAzno1ZGPBybJY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 272c4d1f1fdfa..2009c6f9a0bcb 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -14,19 +14,21 @@ , botan2 , pkg-config , nixosTests +, installShellFiles +, xvfb-run }: let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.3.3"; + version = "24.4.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-1PnGccbEKkFZGE7mxMD8onMkFd/f9qyvERSu+VL3yUE="; + hash = "sha256-HnWxIcOy7Te6Q5YfZYhvITpfsgeQw8Tt/Nr++wcpxEU="; }; nativeBuildInputs = [ @@ -34,6 +36,8 @@ stdenv.mkDerivation { qttools wrapQtAppsHook pkg-config + installShellFiles + xvfb-run ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; buildInputs = [ @@ -49,9 +53,16 @@ stdenv.mkDerivation { "USE_SYSTEM_BOTAN=1" ]; - postInstall = + postInstall = '' + installShellCompletion --cmd ${appname} \ + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) + installShellCompletion --cmd ${pname} \ + --bash <(xvfb-run $out/bin/${appname} --completion bash) \ + --fish <(xvfb-run $out/bin/${appname} --completion fish) + '' # Create a lowercase symlink for Linux - lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.isLinux '' ln -s $out/bin/${appname} $out/bin/${pname} '' # Wrap application for macOS as lowercase binary diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index eb97565cb760d..9b32967159275 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.1"; + version = "8.0.5"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-BW/4jP4lh3leAcdy3JHET/PUybN+0Cy9wxMSi57dAcw="; + sha256 = "sha256-nH7dCrXBhkAYbvb9CPc4zhslFiYtA1ChuYPoHMdBBwQ="; name = "${pname}-${version}.AppImage"; }; @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" + --add-flags $out/share/${pname}/resources/app.asar ''; meta = with lib; { diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index c10b18a6f64a8..c67f53949ce72 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2024-03-14"; + version = "unstable-2024-04-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4910f91cc067b1022d773a40d5762b0ebd47d0f3"; - sha256 = "We3+Y2V2izsgem0fJ0/2pPj5tyjXhOEuubP7lIhnEQ0="; + rev = "5e9e95a34221d4bda584d2130586177e29ee8fe7"; + sha256 = "X0aB0rJZd9G8S+QWviSAdB/YQMT4lVV3yiELzZs+P3g="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://strlen.com/treesheets/"; - maintainers = with maintainers; [ obadz avery ]; + maintainers = with maintainers; [ obadz ]; platforms = platforms.unix; license = licenses.zlib; }; diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index a99fb6070c5e5..55b99bf71b794 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.63.3"; + version = "0.63.5"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1dcq7s4lcp9bc0p4ylzxyfc020xvj7scrlsddzwcnp8mqz5ckik9"; + linuxSource.sha256 = "1a2h96gd04mqn6cskjhj657dx9wqvlqsvgydjbaqpwc8593swpb3"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "0m9m68f9jg10nfn719q6wahwvi13lpc2hmandw7ddxfslylwq29s"; + darwinSource.sha256 = "155y85vsawrqd0wcdpl87sv9s2nkamc73aiklsw8nbw1x96hqvap"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 8416a6f30bacd..09983d4d0091e 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1pnxss85lz313r5l1qpgm9msyfr87h54nbfc7d89dbj0wgsjwk0n"; - version = "0.63.3"; + serverSource.sha256 = "02kd7gm93nmxsxy1bx5kac7jizslik9nlfcnq8kn6mprfcv8anfn"; + version = "0.63.5"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 3de19b4d605f5..e1a236e5db8bc 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.0.7"; + version = "7.0.8"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-NODeDEgmf/nSKrM+RxAUsUwsbVQT7OSDrTOGVBwOzpw="; + sha256 = "sha256-e3WNDB6P7kapAfzlvbJ1/6LcyH7Fl6GKCK/hri460pQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 7d4df1d0e9bbd..2e9393dfedae7 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.6"; + version = "2.6.9"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-wq7CCf+IJ7BpbLwXBemDrsqXy2dHITubQKNR2bUfqW0="; + hash = "sha256-DyBo56NS15s+t9Dl8xCC7MQAqMmZ91FYUYOV4vyJ/Yo="; }; postPatch = '' diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 70c322f268e87..5ccce0a2dc369 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "sha256-tmmOk7nOkuSCjPNHiwAqP5yf1r8+fsCeDGCxhZUImD4="; + sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index f02337ff71beb..8c108af5f82ea 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.9.8"; + version = "1.9.9.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-JbLP65fC6uHrHXpSUwtgYHB+VLfheo5RU3C44lx8QlQ="; + hash = "sha256-i0SVu3txC+JUp0P6cFlmn/66lOmii7JMGIvc43nZoOE="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 1079b2c19641b..a574066045718 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.17.4"; + version = "2.17.5"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-7TjmtF0B+dxUcoXXzpF47dHwxhNMKKQ8Mpf/FFTuwl4="; + hash = "sha256-9VePsl/vaSTZ1TMyIeaGoZNrZv+O/7BxQ3ubD5S2EjY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index f92b63a9ba983..d8d7bcd22d0a8 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -2,7 +2,7 @@ , sqlite, wxGTK32, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk , GLUT -, withGui ? !stdenv.isDarwin # withGui transitively depends on mesa, which is broken on darwin +, withGui ? false }: stdenv.mkDerivation rec { @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.unix; + badPlatforms = lib.optionals withGui platforms.darwin; # withGui transitively depends on mesa, which is broken on darwin }; } diff --git a/pkgs/applications/radio/openwebrx/default.nix b/pkgs/applications/radio/openwebrx/default.nix index b85d02ce042eb..0d65fe8e629b8 100644 --- a/pkgs/applications/radio/openwebrx/default.nix +++ b/pkgs/applications/radio/openwebrx/default.nix @@ -62,13 +62,13 @@ let in buildPythonApplication rec { pname = "openwebrx"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "sha256-7gcgwa9vQT2u8PQusuXKted2Hk0K+Zk6ornSG1K/D4c="; + hash = "sha256-i3Znp5Sxs/KtJazHh2v9/2P+3cEocWB5wIpF7E4pK9s="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index a752592d412da..48116beb3e3b5 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.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-stPzkCLcjzQT0n1NRGT7YN625RPYhJ9FuMkjtFZwtbA="; + hash = "sha256-zPIGqVfpd7Gkm3Ify+AwiCSWQ67ybv9BmuolSu9WzHM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index bb927b0d85980..ab413ca82e386 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -81,7 +81,7 @@ gnuradio3_8.pkgs.mkDerivation rec { description = "SDR transceiver application for analog and digital modes"; mainProgram = "qradiolink"; homepage = "http://qradiolink.org/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index f0597b308a829..c5034bd33efcd 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.29"; + version = "4.2.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xG6nRSk0txUMPPuNRK+hOeqLfCfPt6KcacAtcdZT5E8="; + sha256 = "sha256-WzB/KAkjJ6zPPfOe35kbT3HbbCNQjm44GL0hInk3TH8="; }; buildInputs = [ diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index c0e658678061e..f0bbba9b0a3ba 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,45 +1,96 @@ { lib , stdenv +, fetchFromGitea , fetchFromGitHub , cmake , pkg-config , libusb1 }: +let + generic = { version, pname, src, meta }: + stdenv.mkDerivation { + inherit version pname src; + nativeBuildInputs = [ pkg-config cmake ]; + propagatedBuildInputs = [ libusb1 ]; -stdenv.mkDerivation rec { - pname = "rtl-sdr"; - version = "0.8.0"; + cmakeFlags = lib.optionals stdenv.isLinux [ + "-DINSTALL_UDEV_RULES=ON" + "-DWITH_RPC=ON" + ]; - src = fetchFromGitHub { - owner = "librtlsdr"; - repo = "librtlsdr"; - rev = "v${version}"; - hash = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; - }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \ + --replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}" - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" \ - --replace "VERSION_INFO_PATCH_VERSION git" "VERSION_INFO_PATCH_VERSION ${lib.versions.patch version}" + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; - substituteInPlace rtl-sdr.rules \ - --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' - ''; + meta = with lib; { + inherit (meta) longDescription homepage; + description = "Software to turn the RTL2832U into a SDR receiver"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ bjornfor skovati Tungsten842 ]; + platforms = platforms.unix; + mainProgram = "rtl_sdr"; + }; + }; +in +{ + rtl-sdr-osmocom = generic rec { + pname = "rtl-sdr-osmocom"; + version = "2.0.1"; - nativeBuildInputs = [ pkg-config cmake ]; + src = fetchFromGitea { + domain = "gitea.osmocom.org"; + owner = "sdr"; + repo = "rtl-sdr"; + rev = "v${version}"; + hash = "sha256-+RYSCn+wAkb9e7NRI5kLY8a6OXtJu7QcSUht1R6wDX0="; + }; + meta = { + longDescription = "Rtl-sdr library by the Osmocom project"; + homepage = "https://gitea.osmocom.org/sdr/rtl-sdr"; + }; + }; - propagatedBuildInputs = [ libusb1 ]; + rtl-sdr-librtlsdr = generic rec { + pname = "rtl-sdr-librtlsdr"; + version = "0.9.0"; - cmakeFlags = lib.optionals stdenv.isLinux [ - "-DINSTALL_UDEV_RULES=ON" - "-DWITH_RPC=ON" - ]; + src = fetchFromGitHub { + owner = "librtlsdr"; + repo = "librtlsdr"; + rev = "v${version}"; + hash = "sha256-I1rbywQ0ZBw26wZdtMBkfpj7+kv09XKrrcoDuhIkRmw="; + }; + meta = { + longDescription = '' + Fork of the rtl-sdr library by the Osmocom project. A list of differences + can be found here: https://github.com/librtlsdr/librtlsdr/blob/master/README_improvements.md + ''; + homepage = "https://github.com/librtlsdr/librtlsdr"; + }; + }; - meta = with lib; { - description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = "https://github.com/librtlsdr/librtlsdr"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.linux ++ platforms.darwin; + rtl-sdr-blog = generic rec { + pname = "rtl-sdr-blog"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "rtlsdrblog"; + repo = "rtl-sdr-blog"; + rev = version; + hash = "sha256-7FpT+BoQ2U8KiKwX4NfEwrO3lMBti7RX8uKtT5dFH8M="; + }; + meta = { + longDescription = '' + Fork of the rtl-sdr library by the Osmocom project. A list of differences + can be found here: https://github.com/rtlsdrblog/rtl-sdr-blog/blob/master/README + ''; + homepage = "https://github.com/rtlsdrblog/rtl-sdr-blog"; + }; }; + } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index c20aded859daa..dd9dda24a7dac 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.18.1"; + version = "7.20.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-7sGjO2DyjA/KeAEBTrli+/9QZTKu7VKkJFp3BJk9UVs="; + hash = "sha256-sS/ASTMdNJpllHqtmUsG+qBQ77j8IcG6l4g53/Lmcwk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index 01a8006822f69..f69fbfecd608c 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "soundmodem"; @@ -9,13 +9,26 @@ stdenv.mkDerivation rec { sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; buildInputs = [ alsa-lib audiofile gtk2 libxml2 ]; patches = [ ./matFix.patch ]; doCheck = true; + desktopItems = [ + (makeDesktopItem { + name = "SoundmodemConfig"; + exec = "soundmodemconfig"; + desktopName = "SoundModemConfig"; + comment = "Audio based modem for ham radio supporting ax.25"; + categories = [ "Audio" ]; + }) + ]; + meta = with lib; { description = "Audio based modem for ham radio supporting ax.25"; longDescription = '' diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index 5d03f9bcfdfb2..d5897fe32020c 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.srslte.com/"; description = "Open-source 4G and 5G software radio suite."; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = with platforms; linux ; maintainers = with maintainers; [ hexagonal-sun ]; }; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index a67ddcbee6ab5..321536f71ab52 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, wxGTK32, wrapGAppsHook }: +{ lib, stdenv, fetchurl, cmake, expat, openssl, zlib, lmdb, curl, sqlite, wxGTK32, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.6.5"; + version = "2.7.2"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "sha256-UGPMp1mAarHWuLbZu2wWpjgCdf8ZKj0Mwkqp32U5/8w="; + sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI="; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { zlib lmdb curl + sqlite wxGTK32 ]; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index ab141666c0aa0..863c5b70e0211 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,36 +1,84 @@ -{ - lib, mkDerivation, extra-cmake-modules, fetchurl, - - kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, knotifyconfig, - - - qtx11extras, qtwebsockets, qtkeychain, libsecret, - - eigen, zlib, - - cfitsio, indi-full, xplanet, libnova, libraw, gsl, wcslib, stellarsolver +{ lib +, stdenv +, mkDerivation +, extra-cmake-modules +, fetchurl +, kconfig +, kdoctools +, kguiaddons +, ki18n +, kinit +, kiconthemes +, kio +, knewstuff +, kplotting +, kwidgetsaddons +, kxmlgui +, knotifyconfig +, qtx11extras +, qtwebsockets +, qtkeychain +, qtdatavis3d +, wrapQtAppsHook +, breeze-icons +, libsecret +, eigen +, zlib +, cfitsio +, indi-full +, xplanet +, libnova +, libraw +, gsl +, wcslib +, stellarsolver +, libxisf }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.6.7"; + version = "3.7.0"; src = fetchurl { - url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-uEgzvhlHHpXyvi3Djfwg3GmYeZq+r48m7OJFIDARpe4="; + url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz"; + hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg="; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + wrapQtAppsHook + ]; buildInputs = [ - kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio - knewstuff kplotting kwidgetsaddons kxmlgui knotifyconfig - - qtx11extras qtwebsockets qtkeychain libsecret - - eigen zlib - - cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver + kconfig + kdoctools + kguiaddons + ki18n + kinit + kiconthemes + kio + knewstuff + kplotting + kwidgetsaddons + kxmlgui + knotifyconfig + qtx11extras + qtwebsockets + qtkeychain + qtdatavis3d + breeze-icons + libsecret + eigen + zlib + cfitsio + indi-full + xplanet + libnova + libraw + gsl + wcslib + stellarsolver + libxisf ]; cmakeFlags = [ @@ -51,4 +99,4 @@ mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ timput hjones2199 ]; }; -} +}) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 59472c4b25ce8..35d6bd8aba925 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "23.4"; + version = "24.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-rDqDs6sFaZQbqJcCRhY5w8sFM2mYHHvw0Ud2Niimg4Y="; + hash = "sha256-t3eFmiG9X2cmnjc/PQwZ2bw1SCHaNRA83wiT1cPbKJc="; }; patches = [ diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/applications/science/biology/astral/default.nix index ffe0326239cc0..34077949b97d1 100644 --- a/pkgs/applications/science/biology/astral/default.nix +++ b/pkgs/applications/science/biology/astral/default.nix @@ -2,49 +2,67 @@ , stdenvNoCC , fetchFromGitHub , jdk8 -, makeWrapper , jre8 +, strip-nondeterminism +, makeWrapper , zip }: + let jdk = jdk8; jre = jre8; in -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "astral"; version = "5.7.1"; src = fetchFromGitHub { owner = "smirarab"; repo = "ASTRAL"; - rev = "v${version}"; - sha256 = "043w2z6gbrisqirdid022f4b8jps1pp5syi344krv2bis1gjq5sn"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VhcsX9BxiZ0nISN6Xe4N+kq0iBMCtNhyxDrm9cwXfBA="; }; - nativeBuildInputs = [ jdk makeWrapper jre zip ]; + patches = [ + # we can't use stripJavaArchivesHook here, because the build process puts a .jar file into a zip file + # this patch calls strip-nondeterminism manually + ./make-deterministic.patch + ]; + + nativeBuildInputs = [ + jdk + zip + strip-nondeterminism + makeWrapper + ]; buildPhase = '' + runHook preBuild patchShebangs ./make.sh ./make.sh + runHook postBuild ''; doCheck = true; checkPhase = '' runHook preCheck - java -jar astral.${version}.jar -i main/test_data/song_primates.424.gene.tre + java -jar astral.${finalAttrs.version}.jar -i main/test_data/song_primates.424.gene.tre runHook postCheck ''; installPhase = '' - mkdir -p $out/share/lib - mkdir -p $out/bin - mv astral.${version}.jar $out/share/ - mv lib/*.jar $out/share/lib - mv Astral.${version}.zip $out/share/ - cp -a main/test_data $out/share/ + runHook preInstall + + install -Dm644 astral.${finalAttrs.version}.jar -t $out/share + install -Dm644 lib/*.jar -t $out/share/lib + install -Dm644 Astral.${finalAttrs.version}.zip -t $out/share + cp -a main/test_data $out/share + makeWrapper ${jre}/bin/java $out/bin/astral \ - --add-flags "-jar $out/share/astral.${version}.jar" + --add-flags "-jar $out/share/astral.${finalAttrs.version}.jar" + + runHook postInstall ''; meta = with lib; { @@ -53,9 +71,9 @@ stdenvNoCC.mkDerivation rec { mainProgram = "astral"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars ]; license = licenses.asl20; - maintainers = with maintainers; [ bzizou ]; + maintainers = with maintainers; [ bzizou tomasajt ]; }; -} +}) diff --git a/pkgs/applications/science/biology/astral/make-deterministic.patch b/pkgs/applications/science/biology/astral/make-deterministic.patch new file mode 100644 index 0000000000000..940182e2f49f9 --- /dev/null +++ b/pkgs/applications/science/biology/astral/make-deterministic.patch @@ -0,0 +1,21 @@ +diff --git a/make.sh b/make.sh +index 3ff6529..937b1a2 100644 +--- a/make.sh ++++ b/make.sh +@@ -17,6 +17,8 @@ jar cvfm ../astral.$version.jar ../manifest.text phylonet/util/BitSet.* phylonet + + cd .. + ++strip-nondeterminism --type jar astral.$version.jar ++ + chmod +x astral.$version.jar + sed -e "s/__astral.jar__/astral.$version.jar/g" -e "s/__astral.zip__/Astral.$version.zip/g" README.template.md > README.md + sed -e "s/__astral.jar__/astral.$version.jar/g" -e "s/__astral.zip__/Astral.$version.zip/g" astral-tutorial-template.md > astral-tutorial.md +@@ -32,6 +34,7 @@ ln -s ../astral-tutorial.pdf . + cd .. + rm -f Astral.$version.zip + zip -r Astral.$version.zip Astral ++strip-nondeterminism --type zip Astral.$version.zip + + set +x + echo " diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 19e5f99fe2f63..cafc952dec4c7 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-eCtfG8aQQVGSIx6CITs0k7BH9F5jDcjvbxVNYSarPmg="; + sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index fe1c1f5511d1e..d9092b9eeb11b 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.hpndUc; }; } diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index 17b2ba9f9bdec..d8e90789f4d5f 100644 --- a/pkgs/applications/science/biology/iqtree/default.nix +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.2.2.7"; + version = "2.3.2"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-XyjVo5TYMoB+ZOAGc4ivYqFGnEO1M7mhxXrG45TP44Y="; + hash = "sha256-hAJs48PhIyZSKSRZjQJKQwoJlt6DPRQwaDsuZ00VZII="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/applications/science/biology/macs2/default.nix index 73f12af6a6057..26ec138048f7e 100644 --- a/pkgs/applications/science/biology/macs2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec { ]; nativeBuildInputs = with python3.pkgs; [ - cython + cython_0 numpy setuptools wheel diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index d4ce4071a274e..d463b4fe53665 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.1"; + version = "4.2.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-mb6xcu28QYAFm2906lRNY0zciQBKSGcz3q/cvOEh/VE="; + sha256 = "sha256-ba5I/bsDNAhDb1Kq0lWTC6YgpZ1PpeHPmB/vXx/JRK0="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix index cc60fa4f7265f..3665639a2cd93 100644 --- a/pkgs/applications/science/biology/minia/default.nix +++ b/pkgs/applications/science/biology/minia/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Short read genome assembler"; mainProgram = "minia"; homepage = "https://github.com/GATB/minia"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index eeb31dee0538a..923d72f7fb387 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.27"; + version = "2.28"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-F6IJrYD2dk+5bKKVIahLiNnD/Hd/CjNQQd9zz0Gkans="; + sha256 = "sha256-cBl2BKgPCP/xHZW6fTH51cY9/lV/1HVLsN7a1R1Blv4="; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 5f0ad540f696e..807af7ce488ac 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-sXtF4JmHYoLp0t3o4KF6R2E0qLnKrzSPMXOxVJAm+sU="; + hash = "sha256-EwhpsfRmBLJnPiH6hXQXgG9jSNoC2oqq5lZ6t038VpI="; }; postPatch = '' diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 1c572ba563541..5c46e25f5d6de 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "seqkit"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-JsrmRUbSNCFJ58tIblKq+VRXCD1mBeCAcosDGiVb5Gs="; + sha256 = "sha256-LtPf99spy2ByTnSMJ5k1mWkh+Nct3Fg4Y9mXARxuXlA="; }; vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0="; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 7c1312f27f25b..a4b1cd943e1bb 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file, - pythonSupport ? false, python2Packages, gnome2, openexrSupport ? true, openexr, libzipSupport ? true, libzip, @@ -15,10 +14,6 @@ openglSupport ? !stdenv.isDarwin, libGL }: -let - inherit (python2Packages) pygtk pygobject2 python; -in - stdenv.mkDerivation rec { pname = "gwyddion"; version = "2.65"; @@ -43,9 +38,6 @@ stdenv.mkDerivation rec { optional libuniqueSupport libunique ++ optional libzipSupport libzip; - propagatedBuildInputs = with lib; - optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ]; - # This patch corrects problems with python support, but should apply cleanly # regardless of whether python support is enabled, and have no effects if # it is disabled. diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 93fec7149604b..a3a385802aaaa 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchFromGitLab +, cmake +, pkg-config +, ninja , gfortran , which , perl @@ -14,15 +17,12 @@ , gsl , netcdf , arpack -, autoreconfHook +, spglib +, metis , scalapack , mpi , enableMpi ? true , python3 -, enableFma ? stdenv.hostPlatform.fmaSupport -, enableFma4 ? stdenv.hostPlatform.fma4Support -, enableAvx ? stdenv.hostPlatform.avx2Support -, enableAvx512 ? stdenv.hostPlatform.avx512Support }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -30,21 +30,23 @@ assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "13.0"; + version = "14.0"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-CZ+Qmv6aBQ6w11mLvTP6QAJzaGs+vmmXuNGnSyAqVDU="; + sha256 = "sha256-wQ2I+10ZHLKamW3j6AUtq2KZVm6d29+JxYgwvBKz9DU="; }; nativeBuildInputs = [ which perl procps - autoreconfHook + cmake gfortran + pkg-config + ninja ]; buildInputs = [ @@ -57,34 +59,20 @@ stdenv.mkDerivation rec { netcdf arpack libvdwxc + spglib + metis (python3.withPackages (ps: [ ps.pyyaml ])) ] ++ lib.optional enableMpi scalapack; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; - configureFlags = with lib; [ - "--with-yaml-prefix=${lib.getDev libyaml}" - "--with-blas=-lblas" - "--with-lapack=-llapack" - "--with-fftw-prefix=${lib.getDev fftw}" - "--with-gsl-prefix=${lib.getDev gsl}" - "--with-libxc-prefix=${lib.getDev libxc}" - "--with-libvdwxc" - "--enable-openmp" - ] - ++ optional enableFma "--enable-fma3" - ++ optional enableFma4 "--enable-fma4" - ++ optional enableAvx "--enable-avx" - ++ optional enableAvx512 "--enable-avx512" - ++ optionals enableMpi [ - "--enable-mpi" - "--with-scalapack=-lscalapack" - "CC=mpicc" - "FC=mpif90" + cmakeFlags = [ + (lib.cmakeBool "OCTOPUS_MPI" enableMpi) + (lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi) + (lib.cmakeBool "OCTOPUS_OpenMP" true) ]; - nativeCheckInputs = lib.optional.enableMpi mpi; doCheck = false; checkTarget = "check-short"; diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 8fd9dcc5eaa88..224d804ee1f69 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -1,26 +1,32 @@ { lib , stdenv , fetchurl -, jdk , ant +, jdk , makeWrapper +, strip-nondeterminism }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dataexplorer"; - version = "3.8.3"; + version = "3.8.5"; src = fetchurl { - url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-vU9klb6Mweg8yxnClsIdelG4uW92if64SJ7UHumYYbs="; + url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; + hash = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ="; }; - nativeBuildInputs = [ ant makeWrapper ]; - - buildInputs = [ jdk ]; + nativeBuildInputs = [ + ant + jdk + makeWrapper + strip-nondeterminism + ]; buildPhase = '' + runHook preBuild ant -f build/build.xml dist + runHook postBuild ''; doCheck = false; @@ -30,6 +36,8 @@ stdenv.mkDerivation rec { #''; installPhase = '' + runHook preInstall + ant -Dprefix=$out/share/ -f build/build.xml install # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer @@ -49,6 +57,14 @@ stdenv.mkDerivation rec { $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; { @@ -63,4 +79,4 @@ stdenv.mkDerivation rec { binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json ]; }; -} +}) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index bff63f3b2d7ea..209d47875f8d0 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -21,6 +21,10 @@ , libpthreadstubs , libXdmcp , unixODBC +, libgit2 +, libsecret +, libgcrypt +, libgpg-error , util-linux , libselinux @@ -92,12 +96,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DKICAD_USE_EGL=ON" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + # https://gitlab.com/kicad/code/kicad/-/issues/17133 + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'" ] - ++ optionals (stable) [ - # https://gitlab.com/kicad/code/kicad/-/issues/12491 - # should be resolved in the next major? release - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" - ] + ++ optional (stdenv.hostPlatform.system == "aarch64-linux") + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'qa_spice|qa_cli'" ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" @@ -126,6 +129,10 @@ stdenv.mkDerivation rec { doxygen graphviz pkg-config + libgit2 + libsecret + libgcrypt + libgpg-error ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size @@ -180,13 +187,14 @@ stdenv.mkDerivation rec { doInstallCheck = !(debug); installCheckTarget = "test"; - pythonForTests = python.withPackages(ps: with ps; [ - numpy - pytest - cairosvg - pytest-image-diff - ]); - nativeInstallCheckInputs = optional (!stable) pythonForTests; + nativeInstallCheckInputs = [ + (python.withPackages(ps: with ps; [ + numpy + pytest + cairosvg + pytest-image-diff + ])) + ]; dontStrip = debug; @@ -196,7 +204,7 @@ stdenv.mkDerivation rec { Just the build products, the libraries are passed via an env var in the wrapper, default.nix ''; homepage = "https://www.kicad.org/"; - license = lib.licenses.agpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index fa0c7ae7a75e2..99670eee8a46b 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -205,9 +205,9 @@ stdenv.mkDerivation rec { "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" # required to open a bug report link in firefox-wayland "--set-default MOZ_DBUS_REMOTE 1" - "--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" - "--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" - "--set-default KICAD7_TEMPLATE_DIR ${template_dir}" + "--set-default KICAD8_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" + "--set-default KICAD8_SYMBOL_DIR ${symbols}/share/kicad/symbols" + "--set-default KICAD8_TEMPLATE_DIR ${template_dir}" ] ++ optionals (addons != [ ]) ( let stockDataPath = symlinkJoin { @@ -218,11 +218,11 @@ stdenv.mkDerivation rec { ]; }; in - [ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] + [ "--set-default NIX_KICAD8_STOCK_DATA_PATH ${stockDataPath}" ] ) ++ optionals (with3d) [ - "--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD8_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] diff --git a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch index 16f7e493c6238..43e99a531cf5a 100644 --- a/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch +++ b/pkgs/applications/science/electronics/kicad/runtime_stock_data_path.patch @@ -6,7 +6,7 @@ index a74cdd9..790cc58 100644 { wxString path; -+ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { ++ if( wxGetEnv( wxT( "NIX_KICAD8_STOCK_DATA_PATH" ), &path ) ) { + return path; + } + diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 11837638e1abb..36114fff73a35 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,67 +3,67 @@ { "kicad" = { kicadVersion = { - version = "7.0.10"; + version = "8.0.1"; src = { - rev = "7daac78752749fc919e932be6156914aa83c926f"; - sha256 = "0z459yi0s02mwdgbr3xxw43gn9yjhvfkjnsxmns5mksgzsr5nmhh"; + rev = "20421d65e5a7ede894345d337ab47b469f5ba154"; + sha256 = "096kvmm96ccxir1rspgzzjkp6y2j80l3w2vphg9iv3drxmjp7qjv"; }; }; libVersion = { - version = "7.0.10"; + version = "8.0.1"; libSources = { - symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; - symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; - templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; - templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; - footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; - footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; - packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; - packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; + symbols.rev = "d6aff3948edfca2bacf36900ff080f6b3f65fe4c"; + symbols.sha256 = "00xnvikmqd1zkg9p1f89kvryvkybl5f20baij6babqyc29nbzkwy"; + templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "226b4f3d5c10a4126d88b895188bdab629fe60b0"; + footprints.sha256 = "1bb3mb2a7vkridgmqqm9ib3hv2m4zx1i14mglb11sribypy0ma5p"; + packages3d.rev = "49c1cd4017499b8a7f6dedbe7ede834d1713eb28"; + packages3d.sha256 = "0b5jwr5bbd0kzb75nj3028knjrv0872dk54sbsnxaz669q8zaxap"; }; }; }; "kicad-testing" = { kicadVersion = { - version = "7.0-2024-01-27"; + version = "8.0-2024-02-23"; src = { - rev = "13fcb571f7e5bf4bf142d151651fc577aca32053"; - sha256 = "0wvk3wx5lm2jvyip6b96ja464hdzp9klb7b7ng5i3mdldabh0jba"; + rev = "14d71c8ca6b48d2eb956bb069acf05a37b1b2652"; + sha256 = "0xqd0xbpnvsvba75526nwgzr8l2cfxy99sjmg13sjxfx7rq16kqi"; }; }; libVersion = { - version = "7.0-2024-01-27"; + version = "8.0-2024-02-23"; libSources = { - symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; - symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; - templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; - templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; - footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; - footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; - packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; - packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; + symbols.rev = "e228d4e8b295364e90e36c57f4023d8285ba88cd"; + symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf"; + templates.rev = "2e00c233b67e35323f90d04c190bf70237a252f2"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "6e5329a6d4aaa81290e23af3eba88f505c2f61b0"; + footprints.sha256 = "0ypjlbmzmcl3pha3q2361va70c988b1drxy8320gm66jkzfc21a1"; + packages3d.rev = "d1e521228d9f5888836b1a6a35fb05fb925456fa"; + packages3d.sha256 = "0lcy1av7ixg1f7arflk50jllpc1749sfvf3h62hkxsz97wkr97xj"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2023-08-15"; + version = "2024-02-23"; src = { - rev = "e0d4cf2d5b023a7e5b70d854452376aa3510acd8"; - sha256 = "0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2"; + rev = "b7b64d959f37f00bb0d14b007c3b3908196e1024"; + sha256 = "1gl7mjqpmqq4m55z6crwb77983g00gi2161ichsc7hsfhs4c8grh"; }; }; libVersion = { - version = "2023-08-15"; + version = "2024-02-23"; libSources = { - symbols.rev = "06d20a4b9f7e5375329194d141b096dcdcb7518a"; - symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; - templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; - templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24"; - footprints.sha256 = "1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz"; - packages3d.rev = "f1dae9f95e59216f3b974f585e5b420db853da9e"; - packages3d.sha256 = "0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2"; + symbols.rev = "8b0c343d8694fe0a968e5c4af69fd161bacf7da1"; + symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf"; + templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816"; + templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z"; + footprints.rev = "ded6b053460faae5783c538a38e91e2b4bddcf2e"; + footprints.sha256 = "035bf37n4vrihaj4zfdncisdx9fly1vya7lhkxhlsbv5blpi4a5y"; + packages3d.rev = "984667325076d4e50dab14e755aeacf97f42194c"; + packages3d.sha256 = "0lkaxv02h4sxrnm8zr17wl9d07mazlisad78r35gry741i362cdg"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index dfd679d4d5313..67bc014646e09 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,22 +1,21 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, libSM, freeimage, cmake, wrapQtAppsHook +, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2o2Gue/RnDWxe8jk/Ehx9CM+B3ac5rEQn0H7yodUEZ8="; + sha256 = "sha256-Vyp7asVqvKFkkEb67LXapMkT1AQSburN3+B2dXIPcEU="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook qtquickcontrols2 opencascade-occt libGLU ]; buildInputs = [ qtbase ]; - propagatedBuildInputs = [ libSM freeimage ]; meta = with lib; { description = "A free EDA software to develop printed circuit boards"; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 50be90716e094..5fc4b0036f9fb 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.464"; + version = "8.3.465"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-ICXFskoB/mqKPgjWeIoJ81H2eg4dPSj0bHY7S5/A858="; + sha256 = "sha256-cb9A8rpjD3x3fJo+xexlyzn+/3M5iUJmSoBraom9zd8="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 48c9b17816e99..9bab9991baf82 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.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-Z4YxXPf8uKlASSK9v6fbtHtkUibc9EeA4i+3kD/vBmY="; + hash = "sha256-7g4Ki5lhmX/13XCv0on1PgvEthCTfe9wh8EFjMcP1+c="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { llvm zlib zstd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index c7242117b68ca..3aa5cb22aa52c 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -49,7 +49,7 @@ let # If we don't have a platform available, put a dummy version here, so at # least evaluation succeeds. sources = - (lib.importJSON ./sources.json).${stdenv.system} or { picoscope.version = "unknown"; }; + (lib.importJSON ./sources.json).${stdenv.system} or (throw "unsupported system ${stdenv.system}"); scopePkg = name: { url, version, sha256 }: diff --git a/pkgs/applications/science/electronics/simulide/default.nix b/pkgs/applications/science/electronics/simulide/default.nix index fbd76a0e0ffc6..613ec21dbd961 100644 --- a/pkgs/applications/science/electronics/simulide/default.nix +++ b/pkgs/applications/science/electronics/simulide/default.nix @@ -121,9 +121,9 @@ in simulide_1_1_0 = generic { version = "1.1.0"; - release = "RC1"; + release = "SR0"; branch = "1.1.0"; - rev = "1912"; - sha256 = "sha256-bgRAqt7h2LtU2Ze6Jiz8APhyPcV15v4ofxIilIeZV9E="; + rev = "1917"; + sha256 = "sha256-qNBaGWl89Le9uC1VFK+xYhrLzIvOIWjkQbutnrAmZ2M="; }; } diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix deleted file mode 100644 index 0caac7a4fe932..0000000000000 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "strictdoc"; - version = "0.0.40"; - pyproject = true; - - src = fetchFromGitHub { - owner = "strictdoc-project"; - repo = "strictdoc"; - rev = "refs/tags/${version}"; - hash = "sha256-kZ8qVhroSPSGAcgUFZb1vRI6JoFyjeg/0qYosbRnwyc="; - }; - - pythonRelaxDeps = true; - - nativeBuildInputs = with python3.pkgs; [ - hatchling - pythonRelaxDepsHook - ]; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - datauri - docutils - fastapi - html5lib - jinja2 - lxml - markupsafe - pybtex - pygments - python-multipart - reqif - selenium - setuptools - spdx-tools - textx - toml - uvicorn - webdriver-manager - websockets - xlrd - xlsxwriter - ] ++ uvicorn.optional-dependencies.standard; - - nativeCheckInputs = with python3.pkgs; [ - httpx - pytestCheckHook - ]; - - pythonImportsCheck = [ - "strictdoc" - ]; - - disabledTests = [ - # fixture 'fs' not found - "test_001_load_from_files" - ]; - - disabledTestPaths = [ - "tests/end2end/" - ]; - - meta = with lib; { - description = "Software requirements specification tool"; - mainProgram = "strictdoc"; - homepage = "https://github.com/strictdoc-project/strictdoc"; - changelog = "https://github.com/strictdoc-project/strictdoc/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ yuu ]; - }; -} diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index d84aa5b6918ac..9d151b947b406 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-9GDBcBH49sheO5AjmDsznMEbw0JSrnSOcIIRN40/aJU="; + hash = "sha256-tmWLZBLfdmfYlCQq+zcUneeueDAE6AJeZMy8kfNCC04="; }; in diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index bacf8620e5fdc..1fa78849db6e8 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -1,70 +1,72 @@ { stdenv , fetchFromGitHub +, fetchpatch , lib , python3 -, cmake -, lingeling +, meson +, ninja +, git , btor2tools , symfpu , gtest , gmp , cadical -, minisat -, picosat , cryptominisat , zlib , pkg-config - # "*** internal error in 'lglib.c': watcher stack overflow" on aarch64-linux -, withLingeling ? !stdenv.hostPlatform.isAarch64 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "unstable-2022-10-03"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "3bc0f9f1aca04afabe1aff53dd0937924618b2ad"; - hash = "sha256-UXZERl7Nedwex/oUrcf6/GkDSgOQ537WDYm117RfvWo="; + rev = finalAttrs.version; + hash = "sha256-ZEdV4ml1LwrYwscgOcL2gLx/ijPYqRktXMQH/Njh8OI="; }; - nativeBuildInputs = [ cmake pkg-config ]; + patches = [ + # fix parser on aarch64 + # remove on next release + (fetchpatch { + url = "https://github.com/bitwuzla/bitwuzla/commit/4d914aa5ec34076c37749f0cf6dce976ea510386.patch"; + hash = "sha256-gp+HEamOySjPXCC39tt5DIMdQqEew26a+M15sNdCmTM="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ meson pkg-config git ninja ]; buildInputs = [ cadical cryptominisat - picosat - minisat btor2tools symfpu gmp zlib - ] ++ lib.optional withLingeling lingeling; + ]; + + mesonFlags = [ + # note: the default value for default_library fails to link dynamic dependencies + # but setting it to shared works even in pkgsStatic + "-Ddefault_library=shared" - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DPicoSAT_INCLUDE_DIR=${lib.getDev picosat}/include/picosat" - "-DBtor2Tools_INCLUDE_DIR=${lib.getDev btor2tools}/include/btor2parser" - "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" - ] ++ lib.optional doCheck "-DTESTING=YES"; + (lib.strings.mesonEnable "testing" finalAttrs.doCheck) + ]; - nativeCheckInputs = [ python3 gtest ]; - # two tests fail on darwin and 3 on aarch64-linux - doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64); - preCheck = let - var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - in - '' - export ${var}=$(readlink -f lib) - patchShebangs .. - ''; + nativeCheckInputs = [ python3 ]; + checkInputs = [ gtest ]; + # two tests fail on darwin + doCheck = stdenv.hostPlatform.isLinux; - meta = with lib; { + meta = { description = "A SMT solver for fixed-size bit-vectors, floating-point arithmetic, arrays, and uninterpreted functions"; mainProgram = "bitwuzla"; homepage = "https://bitwuzla.github.io"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ symphorien ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ symphorien ]; }; -} +}) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 873b3836b73e0..12b01dea1a3dd 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: stdenv.mkDerivation rec { pname = "cadical"; @@ -14,6 +14,35 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; doCheck = true; + nativeBuildInputs = [ copyPkgconfigItems ]; + + pkgconfigItems = [ + (makePkgconfigItem { + name = "cadical"; + inherit version; + cflags = [ "-I\${includedir}" ]; + libs = [ "-L\${libdir}" "-lcadical" ]; + variables = { + includedir = "@includedir@"; + libdir = "@libdir@"; + }; + inherit (meta) description; + }) + ]; + + env = { + # copyPkgconfigItems will substitute these in the pkg-config file + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "lib"}/lib"; + }; + + enableParallelBuilding = true; + + # fix static build + postPatch = '' + substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc' + ''; + # the configure script is not generated by autotools and does not accept the # arguments that the default configurePhase passes like --prefix and --libdir configurePhase = '' diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 4be57a1946356..4040cdb797290 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -17,8 +17,14 @@ stdenv.mkDerivation rec { hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo="; }; - buildInputs = [ python3 boost ]; - nativeBuildInputs = [ cmake ]; + strictDeps = true; + buildInputs = [ boost ]; + nativeBuildInputs = [ python3 cmake ]; + + # musl does not have sys/unistd.h + postPatch = '' + substituteInPlace src/picosat/picosat.c --replace-fail '<sys/unistd.h>' '<unistd.h>' + ''; meta = with lib; { description = "An advanced SAT Solver"; diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 83d472c1abb18..acf4f05000bf1 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-NsQhJY++IaLyFc5jqo7TyZBcz0P8VUizGLxdIe9KEO4="; + hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index 68f68355f8160..4f17558b340e4 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -6,7 +6,6 @@ , clang , llvm , python3 -, zlib , z3 , stp , cryptominisat @@ -45,13 +44,13 @@ let }; in stdenv.mkDerivation rec { pname = "klee"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "klee"; repo = "klee"; rev = "v${version}"; - hash = "sha256-y5lWmtIcLAthQ0oHYQNd+ir75YaxHZR9Jgiz+ZUFQjY="; + hash = "sha256-5js1N8qVF0lCkahSU3ojT7+p/a9IaUpPWhIyFHEzqto="; }; nativeBuildInputs = [ cmake ]; @@ -98,6 +97,9 @@ in stdenv.mkDerivation rec { patchShebangs . ''; + # https://github.com/klee/klee/issues/1690 + hardeningDisable = [ "fortify" ]; + doCheck = true; passthru = { diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index 91086ae84627d..a8e459a6bdaee 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -26,12 +26,12 @@ let }); in stdenv.mkDerivation rec { pname = "klee-uclibc"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "klee"; repo = "klee-uclibc"; rev = "klee_uclibc_v${version}"; - sha256 = "sha256-xQ8GWa0Gmd3lbwKodJhrsZeuR4j7NT4zIUh+kNhVY/w="; + sha256 = "sha256-sogQK5Ed0k5tf4rrYwCKT4YRKyEovgT25p0BhGvJ1ok="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index fbc41a67d73ba..479b8a21744ce 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-wUqGADwSocg2ciycCxg9qp+vJLJ2otA/5JpTrkFrDoQ="; + hash = "sha256-jHY8BhDotfGcMS0Xzl5iawqCaug3dDEKuD5Y1WcM06I="; }; postPatch = '' @@ -50,11 +50,6 @@ stdenv.mkDerivation (finalAttrs: { "-DINSTALL_LICENSE=OFF" ]; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index b83302b6ea373..3d86c8cafdbc2 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -1,25 +1,45 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem, unzip }: +{ lib +, stdenv +, fetchurl +, jre +, makeBinaryWrapper +, copyDesktopItems +, makeDesktopItem +, desktopToDarwinBundle +, unzip +}: -stdenv.mkDerivation rec { +let + icon = fetchurl { + url = "https://github.com/logisim-evolution/logisim-evolution/raw/9e0afa3cd6a8bfa75dab61830822cde83c70bb4b/artwork/logisim-evolution-icon.svg"; + hash = "sha256-DNRimhNFt6jLdjqv7o2cNz38K6XnevxD0rGymym3xBs="; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "logisim-evolution"; version = "3.8.0"; src = fetchurl { - url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; + url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar"; + hash = "sha256-TFm+fa3CMp0OMhnKBc6cLIWGQbIG/OpOOCG7ea7wbCw="; }; - dontUnpack = true; - nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ]; + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + unzip + ] ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; desktopItems = [ (makeDesktopItem { - name = pname; + name = "logisim-evolution"; desktopName = "Logisim-evolution"; exec = "logisim-evolution"; icon = "logisim-evolution"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Education" ]; }) ]; @@ -29,23 +49,19 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src" - - # Create icons - unzip $src "resources/logisim/img/*" - for size in 16 32 48 128 256; do - install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim-evolution.png" - done + install -Dm444 ${icon} $out/share/icons/hicolor/scalable/apps/logisim-evolution.svg runHook postInstall ''; - meta = with lib; { + meta = { + changelog = "https://github.com/logisim-evolution/logisim-evolution/releases/tag/v${finalAttrs.version}"; homepage = "https://github.com/logisim-evolution/logisim-evolution"; description = "Digital logic designer and simulator"; mainProgram = "logisim-evolution"; - maintainers = with maintainers; [ emilytrau ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ emilytrau ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index 7d298b3c98ad1..d278f1e784687 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -1,25 +1,39 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem, unzip }: +{ lib +, stdenv +, fetchurl +, jre +, makeBinaryWrapper +, copyDesktopItems +, makeDesktopItem +, desktopToDarwinBundle +, unzip +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "logisim"; version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor version}.x/${version}/logisim-generic-${version}.jar"; - sha256 = "1hkvc9zc7qmvjbl9579p84hw3n8wl3275246xlzj136i5b0phain"; + url = "mirror://sourceforge/project/circuit/${lib.versions.majorMinor finalAttrs.version}.x/${finalAttrs.version}/logisim-generic-${finalAttrs.version}.jar"; + hash = "sha256-Nip4wSrRjCA/7YaIcsSgHNnBIUE3nZLokrviw35ie8I="; }; - dontUnpack = true; - nativeBuildInputs = [ makeWrapper copyDesktopItems unzip ]; + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + unzip + ] ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle + ]; desktopItems = [ (makeDesktopItem { - name = pname; + name = "logisim"; desktopName = "Logisim"; exec = "logisim"; icon = "logisim"; - comment = meta.description; + comment = finalAttrs.meta.description; categories = [ "Education" ]; }) ]; @@ -34,19 +48,19 @@ stdenv.mkDerivation rec { unzip $src "resources/logisim/img/*" for size in 16 20 24 48 64 128 do - install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim.png" + install -Dm444 "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim.png" done runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; mainProgram = "logisim"; - maintainers = with maintainers; [ emilytrau ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ emilytrau ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 3b58331562a23..7b4c85fe9b215 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.80"; + version = "1.82"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-jpt/5h0HnkiJowyVDoMSyiuL6/dokB4xg1sdyctHrDs="; + hash = "sha256-iW2mQPmKfbAWaiEURyVly5IjJ3YpXjVBkm/UbUuwb6k="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/logic/symfpu/default.nix b/pkgs/applications/science/logic/symfpu/default.nix index af61b7c617c78..2c83793114a15 100644 --- a/pkgs/applications/science/logic/symfpu/default.nix +++ b/pkgs/applications/science/logic/symfpu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: stdenv.mkDerivation rec { pname = "symfpu"; @@ -11,9 +11,32 @@ stdenv.mkDerivation rec { sha256 = "1jf5lkn67q136ppfacw3lsry369v7mdr1rhidzjpbz18jfy9zl9q"; }; + nativeBuildInputs = [ copyPkgconfigItems ]; + + pkgconfigItems = [ + (makePkgconfigItem { + name = "symfpu"; + inherit version; + cflags = [ "-I\${includedir}" ]; + variables = { + includedir = "@includedir@"; + }; + inherit (meta) description; + }) + ]; + + env = { + # copyPkgconfigItems will substitute this in the pkg-config file + includedir = "${placeholder "out"}/include"; + }; + installPhase = '' - mkdir -p $out/symfpu - cp -r * $out/symfpu/ + runHook preInstall + + mkdir -p $out/include/symfpu + cp -r * $out/include/symfpu/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 09ef2d7d46372..2aa92118b03a7 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -1,17 +1,23 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, fetchpatch, lib, stdenv +{ haskellPackages, mkDerivation, fetchFromGitHub, applyPatches, lib, stdenv # the following are non-haskell dependencies , makeWrapper, which, maude, graphviz, glibcLocales }: let version = "1.8.0"; - src = fetchFromGitHub { - owner = "tamarin-prover"; - repo = "tamarin-prover"; - rev = version; - sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; + src = applyPatches { + src = fetchFromGitHub { + owner = "tamarin-prover"; + repo = "tamarin-prover"; + rev = version; + sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; + }; + patches = [ + ./tamarin-prover-1.8.0-ghc-9.6.patch + ]; }; + # tamarin has its own dependencies, but they're kept inside the repo, # no submodules. this factors out the common metadata among all derivations common = pname: src: { @@ -34,7 +40,7 @@ let tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // { postPatch = replaceSymlinks; libraryHaskellDepends = with haskellPackages; [ - base64-bytestring blaze-builder + base64-bytestring blaze-builder list-t dlist exceptions fclabels safe SHA syb ]; }); @@ -93,8 +99,6 @@ mkDerivation (common "tamarin-prover" src // { isLibrary = false; isExecutable = true; - patches = [ ]; - # strip out unneeded deps manually doHaddock = false; enableSharedExecutables = false; diff --git a/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch b/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch new file mode 100644 index 0000000000000..f6a07f3646cad --- /dev/null +++ b/pkgs/applications/science/logic/tamarin-prover/tamarin-prover-1.8.0-ghc-9.6.patch @@ -0,0 +1,237 @@ +commit 084bd5474d9ac687656c2a3a6b2e1d507febaa98 +Author: Artur Cygan <arczicygan@gmail.com> +Date: Mon Feb 26 10:04:48 2024 +0100 + + Update to GHC 9.6 (#618) + + Cherry-picked from b3e18f61e45d701d42d794bc91ccbb4c0e3834ec. + + Removing Control.Monad.List + +diff --git a/lib/sapic/src/Sapic/Exceptions.hs b/lib/sapic/src/Sapic/Exceptions.hs +index 146b721e..b9962478 100644 +--- a/lib/sapic/src/Sapic/Exceptions.hs ++++ b/lib/sapic/src/Sapic/Exceptions.hs +@@ -23,7 +23,6 @@ import Theory.Sapic + import Data.Label + import qualified Data.Maybe + import Theory.Text.Pretty +-import Sapic.Annotation --toAnProcess + import Theory.Sapic.Print (prettySapic) + import qualified Theory.Text.Pretty as Pretty + +@@ -67,14 +66,14 @@ data ExportException = UnsupportedBuiltinMS + | UnsupportedTypes [String] + + instance Show ExportException where +- ++ + show (UnsupportedTypes incorrectFunctionUsages) = do + let functionsString = List.intercalate ", " incorrectFunctionUsages + (case length functionsString of + 1 -> "The function " ++ functionsString ++ ", which is declared with a user-defined type, appears in a rewrite rule. " + _ -> "The functions " ++ functionsString ++ ", which are declared with a user-defined type, appear in a rewrite rule. ") + ++ "However, the translation of rules only works with bitstrings at the moment." +- show unsuppBuiltin = ++ show unsuppBuiltin = + "The builtins bilinear-pairing and multiset are not supported for export. However, your model uses " ++ + (case unsuppBuiltin of + UnsupportedBuiltinBP -> "bilinear-pairing." +@@ -93,7 +92,7 @@ instance Show (SapicException an) where + show (InvalidPosition p) = "Invalid position:" ++ prettyPosition p + show (NotImplementedError s) = "This feature is not implemented yet. Sorry! " ++ s + show (ImplementationError s) = "You've encountered an error in the implementation: " ++ s +- show a@(ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p)) ++ show (ProcessNotWellformed e p) = "Process not well-formed: " ++ Pretty.render (text (show e) $-$ nest 2 (maybe emptyDoc prettySapic p)) + show ReliableTransmissionButNoProcess = "The builtin support for reliable channels currently only affects the process calculus, but you have not specified a top-level process. Please remove \"builtins: reliable-channel\" to proceed." + show (CannotExpandPredicate facttag rstr) = "Undefined predicate " + ++ showFactTagArity facttag +@@ -135,7 +134,7 @@ instance Show WFerror where + ++ prettySapicFunType t2 + ++ "." + show (FunctionNotDefined sym ) = "Function not defined " ++ show sym +- ++ + + instance Exception WFerror + instance (Typeable an) => Exception (SapicException an) +diff --git a/lib/term/src/Term/Narrowing/Narrow.hs b/lib/term/src/Term/Narrowing/Narrow.hs +index 56f145d9..88f89aa1 100644 +--- a/lib/term/src/Term/Narrowing/Narrow.hs ++++ b/lib/term/src/Term/Narrowing/Narrow.hs +@@ -12,6 +12,7 @@ module Term.Narrowing.Narrow ( + import Term.Unification + import Term.Positions + ++import Control.Monad + import Control.Monad.Reader + + import Extension.Prelude +diff --git a/lib/term/src/Term/Unification.hs b/lib/term/src/Term/Unification.hs +index b5c107cd..fcf52128 100644 +--- a/lib/term/src/Term/Unification.hs ++++ b/lib/term/src/Term/Unification.hs +@@ -61,7 +61,7 @@ module Term.Unification ( + , pairDestMaudeSig + , symEncDestMaudeSig + , asymEncDestMaudeSig +- , signatureDestMaudeSig ++ , signatureDestMaudeSig + , locationReportMaudeSig + , revealSignatureMaudeSig + , hashMaudeSig +@@ -80,7 +80,7 @@ module Term.Unification ( + , module Term.Rewriting.Definitions + ) where + +--- import Control.Applicative ++import Control.Monad + import Control.Monad.RWS + import Control.Monad.Except + import Control.Monad.State +diff --git a/lib/theory/src/Theory/Constraint/System/Guarded.hs b/lib/theory/src/Theory/Constraint/System/Guarded.hs +index 99f985a8..3f0cd8d8 100644 +--- a/lib/theory/src/Theory/Constraint/System/Guarded.hs ++++ b/lib/theory/src/Theory/Constraint/System/Guarded.hs +@@ -88,6 +88,7 @@ module Theory.Constraint.System.Guarded ( + + import Control.Arrow + import Control.DeepSeq ++import Control.Monad + import Control.Monad.Except + import Control.Monad.Fresh (MonadFresh, scopeFreshness) + import qualified Control.Monad.Trans.PreciseFresh as Precise (Fresh, evalFresh, evalFreshT) +diff --git a/lib/utils/src/Control/Monad/Trans/Disj.hs b/lib/utils/src/Control/Monad/Trans/Disj.hs +index 96dae742..b3b63825 100644 +--- a/lib/utils/src/Control/Monad/Trans/Disj.hs ++++ b/lib/utils/src/Control/Monad/Trans/Disj.hs +@@ -18,10 +18,10 @@ module Control.Monad.Trans.Disj ( + , runDisjT + ) where + +--- import Control.Applicative +-import Control.Monad.List +-import Control.Monad.Reader ++import Control.Monad + import Control.Monad.Disj.Class ++import Control.Monad.Reader ++import ListT + + + ------------------------------------------------------------------------------ +@@ -33,12 +33,12 @@ newtype DisjT m a = DisjT { unDisjT :: ListT m a } + deriving (Functor, Applicative, MonadTrans ) + + -- | Construct a 'DisjT' action. +-disjT :: m [a] -> DisjT m a +-disjT = DisjT . ListT ++disjT :: (Monad m, Foldable m) => m a -> DisjT m a ++disjT = DisjT . fromFoldable + + -- | Run a 'DisjT' action. +-runDisjT :: DisjT m a -> m [a] +-runDisjT = runListT . unDisjT ++runDisjT :: Monad m => DisjT m a -> m [a] ++runDisjT = toList . unDisjT + + + +@@ -47,8 +47,6 @@ runDisjT = runListT . unDisjT + ------------ + + instance Monad m => Monad (DisjT m) where +- {-# INLINE return #-} +- return = DisjT . return + {-# INLINE (>>=) #-} + m >>= f = DisjT $ (unDisjT . f) =<< unDisjT m + +diff --git a/lib/utils/tamarin-prover-utils.cabal b/lib/utils/tamarin-prover-utils.cabal +index 75ed2b46..bb54d1e5 100644 +--- a/lib/utils/tamarin-prover-utils.cabal ++++ b/lib/utils/tamarin-prover-utils.cabal +@@ -47,6 +47,7 @@ library + , deepseq + , dlist + , fclabels ++ , list-t + , mtl + , pretty + , safe +diff --git a/src/Main/Mode/Batch.hs b/src/Main/Mode/Batch.hs +index e7710682..d370da85 100644 +--- a/src/Main/Mode/Batch.hs ++++ b/src/Main/Mode/Batch.hs +@@ -32,7 +32,8 @@ import Main.TheoryLoader + import Main.Utils + + import Theory.Module +-import Control.Monad.Except (MonadIO(liftIO), runExceptT) ++import Control.Monad.Except (runExceptT) ++import Control.Monad.IO.Class (MonadIO(liftIO)) + import System.Exit (die) + import Theory.Tools.Wellformedness (prettyWfErrorReport) + import Text.Printf (printf) +diff --git a/src/Main/TheoryLoader.hs b/src/Main/TheoryLoader.hs +index 7fffb85b..71fba2b9 100644 +--- a/src/Main/TheoryLoader.hs ++++ b/src/Main/TheoryLoader.hs +@@ -42,8 +42,6 @@ module Main.TheoryLoader ( + + ) where + +--- import Debug.Trace +- + import Prelude hiding (id, (.)) + + import Data.Char (toLower) +@@ -58,8 +56,10 @@ import Data.Bifunctor (Bifunctor(bimap)) + import Data.Bitraversable (Bitraversable(bitraverse)) + + import Control.Category +-import Control.Exception (evaluate) + import Control.DeepSeq (force) ++import Control.Exception (evaluate) ++import Control.Monad ++import Control.Monad.IO.Class (MonadIO(liftIO)) + + import System.Console.CmdArgs.Explicit + import System.Timeout (timeout) +@@ -387,10 +387,10 @@ closeTheory version thyOpts sign srcThy = do + deducThy <- bitraverse (return . addMessageDeductionRuleVariants) + (return . addMessageDeductionRuleVariantsDiff) transThy + +- derivCheckSignature <- Control.Monad.Except.liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign) ++ derivCheckSignature <- liftIO $ toSignatureWithMaude (get oMaudePath thyOpts) $ maudePublicSig (toSignaturePure sign) + variableReport <- case compare derivChecks 0 of + EQ -> pure $ Just [] +- _ -> Control.Monad.Except.liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver) ++ _ -> liftIO $ timeout (1000000 * derivChecks) $ evaluate . force $ (either (\t -> checkVariableDeducability t derivCheckSignature autoSources defaultProver) + (\t-> diffCheckVariableDeducability t derivCheckSignature autoSources defaultProver defaultDiffProver) deducThy) + + let report = wellformednessReport ++ (fromMaybe [(underlineTopic "Derivation Checks", Pretty.text "Derivation checks timed out. Use --derivcheck-timeout=INT to configure timeout, 0 to deactivate.")] variableReport) +diff --git a/stack.yaml b/stack.yaml +index 7267ba17..b53f6ff8 100644 +--- a/stack.yaml ++++ b/stack.yaml +@@ -7,7 +7,7 @@ packages: + - lib/sapic/ + - lib/export/ + - lib/accountability/ +-resolver: lts-20.26 ++resolver: lts-22.11 + ghc-options: + "$everything": -Wall + nix: +diff --git a/tamarin-prover.cabal b/tamarin-prover.cabal +index 89a7e3a8..986274ea 100644 +--- a/tamarin-prover.cabal ++++ b/tamarin-prover.cabal +@@ -106,7 +106,7 @@ executable tamarin-prover + default-language: Haskell2010 + + if flag(threaded) +- ghc-options: -threaded -eventlog ++ ghc-options: -threaded + + -- -XFlexibleInstances + diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 6698e47844a22..182f6eb81eeb2 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.80"; + version = "1.82"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/aWiN+DPlIjI89u5kx6QoyrGD4DOJTHXxIZ0qHJNDls="; + hash = "sha256-sl83l6nLN/bluED5bnFShviD1Vv8hmRazxIcLUg/ego="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 244eaa05d695d..21174305b9e3e 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,38 +1,51 @@ -{ lib, python3Packages, fetchFromGitHub, qt5 }: - python3Packages.buildPythonApplication rec { - pname = "labelImg"; - version = "1.8.3"; - src = fetchFromGitHub { - owner = "tzutalin"; - repo = "labelImg"; - rev = "v${version}"; - sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5"; - }; - nativeBuildInputs = with python3Packages; [ - pyqt5 - qt5.wrapQtAppsHook - ]; - propagatedBuildInputs = with python3Packages; [ - pyqt5 - lxml - sip4 - ]; - preBuild = '' - make qt5py3 - ''; - postInstall = '' - cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs - ''; - dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with lib; { - description = "A graphical image annotation tool and label object bounding boxes in images"; - mainProgram = "labelImg"; - homepage = "https://github.com/tzutalin/labelImg"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.cmcdragonkai ]; - }; - } +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch, + qt5, +}: +python3Packages.buildPythonApplication rec { + pname = "labelImg"; + version = "1.8.6"; + src = fetchFromGitHub { + owner = "tzutalin"; + repo = "labelImg"; + rev = "v${version}"; + hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; + }; + nativeBuildInputs = with python3Packages; [ + pyqt5 + qt5.wrapQtAppsHook + ]; + patches = [ + # fixes https://github.com/heartexlabs/labelImg/issues/838 + # can be removed after next upstream version bump + (fetchpatch { + url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; + hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ + pyqt5 + lxml + ]; + preBuild = '' + make qt5py3 + ''; + postInstall = '' + cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + ''; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + meta = with lib; { + description = "A graphical image annotation tool and label object bounding boxes in images"; + mainProgram = "labelImg"; + homepage = "https://github.com/tzutalin/labelImg"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; +} diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f4cc1f1fbfeaa..acfc38686ea42 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "R"; - version = "4.3.2"; + version = "4.3.3"; src = let inherit (finalAttrs) pname version; in fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo="; + sha256 = "sha256-gIUSMTk7hb84d+6eObKC51Dthkxexgy9aObhOfBSAzA="; }; outputs = [ "out" "tex" ]; diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 2b05b552253dd..7717458d0dac2 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -22,6 +22,6 @@ with python3.pkgs; buildPythonApplication rec { mainProgram = "almonds"; homepage = "https://github.com/Tenchi2xh/Almonds"; license = licenses.mit; - maintainers = with maintainers; [ infinisil ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 25f7229a845ae..2a84d4b27b141 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -22,7 +22,7 @@ }: let - inherit (cudaPackages) cudatoolkit nccl; + inherit (cudaPackages) backendStdenv cudatoolkit nccl; # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "-DBLAS=open" ] ++ (if cudaSupport then [ "-DCUDA_ARCH_NAME=All" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" ] else [ "-DCPU_ONLY=ON" ]) ++ ["-DUSE_NCCL=${toggle ncclSupport}"] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 90a67efd5f05d..b39d7ae26079d 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2024-03-11"; + version = "unstable-2024-04-08"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "dfa24af6c747e1c90d79a462c2a5a0716b3a1dc0"; - hash = "sha256-kgC+E/ecgl27Hs+qCyqg8CjbEyB91AgN397DST/dPMI="; + rev = "c0be6c47309aa40d44784a3a4c4c07bc4e8fb6fa"; + hash = "sha256-UVCazX0P03+e1exnpXrGNc/1vHxLH04Xtvgsy00UAoI="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 11a42d1cfdf8a..8fa6da16e336b 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.cc.isClang '' substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" + + for f in $(find -name "*.h" -or -name "*.cpp"); do + substituteInPlace "$f" --replace-quiet "log2" "_log2" + done ''; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 669d3a3ab8f1e..57b20fe12d7c2 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg +{ lib, stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt , python ? null, enablePython ? false }: @@ -7,11 +7,11 @@ assert enablePython -> (python != null); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.11.1"; + version = "4.12.2"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-xf4bfL1AOIioFJKfL9D11p4nYAIioYx4bbW3boAFs2U="; + hash = "sha256-E+CdnKgQLlxAFx1u4VDGaHQrmMOmylf4N/e2Th4q9I8="; }; buildInputs = [ @@ -26,19 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-python.patch - - # Pull upstream fix git gcc-13: - # https://gitlab.onelab.info/gmsh/gmsh/-/issues/2416 - (fetchpatch { - name = "gcc-13-p1.patch"; - url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/fb81a9c9026700e078de947b4522cb39e543a86b.patch"; - hash = "sha256-1GInFqQZvOgflC3eQTjmZ9uBGFASRNCpCwDACN3yTQ4="; - }) - (fetchpatch { - name = "gcc-13-p2.patch"; - url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/aceb09c807b78ea26555f99fcb16c4f87c31fb5a.patch"; - hash = "sha256-6FI0hIvj8hglCvxoKV0GzT2/F/Wz+ddkxV/TLzzJBLU="; - }) ]; postPatch = '' diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/applications/science/math/gmsh/fix-python.patch index ac07c169c99b8..41c5c3b8f9760 100644 --- a/pkgs/applications/science/math/gmsh/fix-python.patch +++ b/pkgs/applications/science/math/gmsh/fix-python.patch @@ -1,50 +1,13 @@ diff --git a/api/gmsh.py b/api/gmsh.py -index 747acb203..02004da5d 100644 +index f525284..a225c85 100644 --- a/api/gmsh.py +++ b/api/gmsh.py -@@ -44,44 +44,7 @@ moduledir = os.path.dirname(os.path.realpath(__file__)) - parentdir1 = os.path.dirname(moduledir) - parentdir2 = os.path.dirname(parentdir1) +@@ -78,6 +78,8 @@ if not libpath: + else: + libpath = find_library("gmsh") --if platform.system() == "Windows": -- libname = "gmsh-4.11.dll" --elif platform.system() == "Darwin": -- libname = "libgmsh.4.11.dylib" --else: -- libname = "libgmsh.so.4.11" -- --# check if the library is in the same directory as the module... --libpath = os.path.join(moduledir, libname) -- --# ... or in the parent directory or its lib or Lib subdirectory --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir1, libname) --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir1, "lib", libname) --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir1, "Lib", libname) -- --# ... or in the parent of the parent directory or its lib or Lib subdirectory --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir2, libname) --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir2, "lib", libname) --if not os.path.exists(libpath): -- libpath = os.path.join(parentdir2, "Lib", libname) -- --# if we couldn't find it, use ctype's find_library utility... --if not os.path.exists(libpath): -- if platform.system() == "Windows": -- libpath = find_library("gmsh-4.11") -- if not libpath: -- libpath = find_library("gmsh") -- else: -- libpath = find_library("gmsh") -- --# ... and print a warning if everything failed --if not os.path.exists(libpath): -- print("Warning: could not find Gmsh shared library " + libname) +libpath = "@LIBPATH@" - - lib = CDLL(libpath) - ++ + # ... and print a warning if everything failed + if not libpath: + print("Warning: could not find Gmsh shared library " + libname + diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 35b9e9d7a8d4a..53091e6a84e50 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 = "9.5.1"; + version = "11.0.1"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "sha256-+oKFnTPwj7iuudpmsPvZFxjtVzxTT1capSNyyd64kdo="; + hash = "sha256-oZ7Oz22e4k6cVF3TDFxp/pE+RuU+3p/CatTWj1ci5ZY="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 3d4d5b8a197dc..1de6d416a0e64 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, zlib, gmp, ecm }: +{ lib, stdenv, fetchsvn, zlib, gmp, ecm }: stdenv.mkDerivation rec { pname = "msieve"; - version = "1.53"; + version = "r1050"; - src = fetchurl { - url = "mirror://sourceforge/msieve/msieve/Msieve%20v${version}/msieve${lib.replaceStrings ["."] [""] version}_src.tar.gz"; - sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/msieve/code/trunk"; + rev = "1050"; + hash = "sha256-cn6OhE4zhrpB7BFrRdOnucjATbfo5mLkK7O0Usx1quE="; }; buildInputs = [ zlib gmp ecm ]; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 993da2b898981..839537438962b 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -5,7 +5,7 @@ }: let - inherit (cudaPackages) cudatoolkit cudaFlags cudnn; + inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn; in assert cudnnSupport -> cudaSupport; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ (if cudaSupport then [ "-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743 "-DCUDA_ARCH_NAME=All" - "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" + "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc" "-DMXNET_CUDA_ARCH=${builtins.concatStringsSep ";" cudaFlags.realArches}" ] else [ "-DUSE_CUDA=OFF" ]) ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index ef8c041039b15..c1feeffdcb6d9 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "2.7r4"; + version = "2.8.8"; src = fetchurl { - url = "https://pallini.di.uniroma1.it/nauty${builtins.replaceStrings ["."] [""] version}.tar.gz"; - sha256 = "sha256-uBDIWm/imfO0yfJKr5KcrH+VRsLzXCDh3Qrbx0CISKY="; + url = "https://pallini.di.uniroma1.it/nauty${builtins.replaceStrings ["."] ["_"] version}.tar.gz"; + sha256 = "sha256-FZ0hVoEKa7JAQQzWHrZBrdhQiNnxXIiM2qN7hoH5Kc4="; }; outputs = [ "out" "dev" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # I'm not sure if the filename will remain the same for future changelog or # if it will track changes to minor releases. Lets see. Better than nothing # in any case. - changelog = "https://pallini.di.uniroma1.it/changes24-27.txt"; + changelog = "https://pallini.di.uniroma1.it/changes24-28.txt"; homepage = "https://pallini.di.uniroma1.it/"; }; } diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index ffe17bc3dec21..2fe77aa14a650 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/${pname}-${version}.tar.gz"; - sha256 = "1q1cl3vpdir16szy0jcadysydcrjp48hqxyx42kr8g9digkqjgkj"; + sha256 = "sha256-fkp78hmZioRMC8zgoXbknQdDy0tQWg4ZUym/LsGW3dc="; }; hardeningDisable = [ diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index fe9210641d2e7..9c2623651517d 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -14,14 +14,11 @@ , ninja , ant , openjdk -, perl536Packages +, perl +, perlPackages , makeWrapper }: -let - # log says: polymake does not work with perl 5.37 or newer; - perlPackages = perl536Packages; - inherit (perlPackages) perl; -in + # polymake compiles its own version of sympol and atint because we # don't have those packages. other missing optional dependencies: # javaview, libnormaliz, scip, soplex, jreality. diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 032ae257c5641..420b495e736e6 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pspp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://gnu/pspp/${pname}-${version}.tar.gz"; - sha256 = "sha256-qPbLiGr1sIOENXm81vsZHAVKzOKMxotY58XwmZai2N8="; + sha256 = "sha256-jtuw8J6M+AEMrZ4FWeAjDX/FquRyHHVsNQVU3zMCTAA="; }; nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ]; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 6b15073675f73..be126e5fa3974 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SGDORHX+lk6PS5/sPAmKZLfZD99/A7XvDPDnuAygDAM="; + sha256 = "sha256-uXaI8dwTRtg8LnFxopgXr9x/vEl8ixzIGOsSQQkAkoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 765c691c95551..6624dcc36528b 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -15,7 +15,7 @@ let pkgs = pkgs.python3.pkgs.overrideScope (self: super: { # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { - inherit flint arb; + inherit flint3; inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; @@ -73,7 +73,7 @@ let sagelib = python3.pkgs.sagelib; sage-docbuild = python3.pkgs.sage-docbuild; inherit env-locations; - inherit python3 singular palp flint pythonEnv maxima; + inherit python3 singular palp flint3 pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -125,9 +125,7 @@ let ignoreCollisions = true; } // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible - arb = pkgs.arb.override { inherit flint; }; - - singular = pkgs.singular.override { inherit flint; }; + singular = pkgs.singular.override { inherit flint3; }; maxima = pkgs.maxima-ecl.override { lisp-compiler = pkgs.ecl.override { @@ -149,7 +147,7 @@ let # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint = pkgs.flint.override { withBlas = false; }; + flint3 = pkgs.flint3.override { withBlas = false; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 39d358a1f9a83..1ca0f471a7ee2 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -3,7 +3,6 @@ , pari , singular , maxima -, conway_polynomials , graphs , elliptic_curves , polytopes_db @@ -27,16 +26,13 @@ writeTextFile rec { export GPDOCDIR="${pari}/share/pari/doc" export SINGULARPATH='${singular}/share/singular' export SINGULAR_SO='${singular}/lib/libSingular.so' - export GAP_SO='${gap}/lib/libgap.so' export SINGULAR_EXECUTABLE='${singular}/bin/Singular' export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas' export MAXIMA_PREFIX="${maxima}" - export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials' export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_LIB_DIR='${gap}/lib/gap' - export GAP_SHARE_DIR='${gap}/share/gap' + export GAP_ROOT_PATHS='${gap}/lib/gap;${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix index fb8c3ec8a204e..b45998bbcb86d 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -4,6 +4,7 @@ , jupyter-sphinx , sphinx , sphinx-copybutton +, sphinx-inline-tabs }: buildPythonPackage rec { @@ -15,6 +16,7 @@ buildPythonPackage rec { jupyter-sphinx sphinx sphinx-copybutton + sphinx-inline-tabs ]; preBuild = '' diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix index a96f7ccd5d4c0..e1c497678d50b 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , sage-src -, cython_3 +, cython , jinja2 , pkgconfig # the python module, not the pkg-config alias }: @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sage-setup"; src = sage-src; - nativeBuildInputs = [ cython_3 ]; + nativeBuildInputs = [ cython ]; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ jinja2 ]; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 4c22470de9109..f95e08c51ff4d 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -39,10 +39,9 @@ , ecm , lcalc , rubiks -, flintqs , blas , lapack -, flint +, flint3 , gmp , mpfr , zlib @@ -93,7 +92,6 @@ let ecm lcalc rubiks - flintqs jdk # only needed for `jmol` which may be replaced in the future less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] @@ -155,7 +153,7 @@ writeTextFile rec { # cython needs to find these libraries, otherwise will fail with `ld: cannot find -lflint` or similar export LDFLAGS='${ lib.concatStringsSep " " (map (pkg: "-L${pkg}/lib") [ - flint + flint3 gap glpk gmp @@ -174,7 +172,7 @@ writeTextFile rec { singular gmp.dev glpk - flint + flint3 gap mpfr.dev ]) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a77565e4072ac..00ef5d428337d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.2"; + version = "10.3"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-VXnPdJhtw5Y/anecrVpevJDCyBVfnjksyuuZslNipm4="; + hash = "sha256-OHtMv8t0RrP6R8XIREU+C1vpazeQLWa75wx9Mv6BN1U="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-b2813506039143e6f0abe859ab67a343abf72c2e.tar.gz"; - sha256 = "sha256-a1v0XyoKI+zO6Sjm8DzEwItRHbIgRDbpj4UfwVH+/hw="; + url = "mirror://sageupstream/configure/configure-ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b.tar.gz"; + hash = "sha256-pe9AxTM+gFSR4/eVfUzay+4bwjoubbYeDPc+avKjlaw="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -53,6 +53,13 @@ stdenv.mkDerivation rec { # algorithm soon, disable this test for now. # https://github.com/sagemath/sage/issues/34575 ./patches/disable-slow-glpk-test.patch + + # https://github.com/sagemath/sage/pull/37489, landed in 10.4.beta1 + (fetchpatch { + name = "quaternionalgebra-random-failure.patch"; + url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; + hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -62,11 +69,11 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/37123, to land in 10.3.beta7 + # https://github.com/sagemath/sage/pull/37492 (fetchpatch { - name = "scipy-1.12-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/54eec464e9fdf18b411d9148aecb918178e95909.diff"; - sha256 = "sha256-9wyNrcSfF6mYFTIV4ev2OdD7igb0AeyZZYWSc/+JrIU="; + name = "singular-4.3.2p14-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; + sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; }) ]; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index b2c0843d3100a..88c753e89c9da 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -13,7 +13,6 @@ , gmp , gfan , python3 -, flintqs , eclib , ntl , ecm @@ -40,7 +39,6 @@ let gfan maxima eclib - flintqs ntl ecm ]; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 5a1f4ee473c9b..0a2bd8011b0bd 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -10,7 +10,6 @@ , iml , libpng , readline -, arb , blas , boost , brial @@ -18,7 +17,7 @@ , eclib , ecm , fflas-ffpack -, flint +, flint3 , gap , giac , givaro @@ -45,10 +44,11 @@ , singular , sqlite , symmetrica +, conway-polynomials , cvxopt , cypari2 , cysignals -, cython_3 +, cython , fpylll , gmpy2 , importlib-metadata @@ -92,6 +92,7 @@ buildPythonPackage rec { version = src.version; pname = "sagelib"; src = sage-src; + pyproject = true; nativeBuildInputs = [ iml @@ -112,7 +113,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ # native dependencies (TODO: determine which ones need to be propagated) - arb blas boost brial @@ -120,7 +120,7 @@ buildPythonPackage rec { eclib ecm fflas-ffpack - flint + flint3 gap giac givaro @@ -149,10 +149,11 @@ buildPythonPackage rec { symmetrica # from src/sage/setup.cfg and requirements.txt + conway-polynomials cvxopt cypari2 cysignals - cython_3 + cython fpylll gmpy2 importlib-metadata @@ -202,11 +203,7 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" - # version lower bounds are useful, but upper bounds are a hassle because - # Sage tests already catch any relevant API breakage. - # according to the discussion at https://trac.sagemath.org/ticket/33520, - # upper bounds will be less noisy starting from Sage 9.6. - sed -i 's/, <[^, ]*//' build/pkgs/*/install-requires.txt + sed -i "/sage-conf/d" src/{setup.cfg,pyproject.toml,requirements.txt} cd build/pkgs/sagelib/src ''; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index f77bd5a92243c..d079134aec76d 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -5,7 +5,7 @@ , sharutils , file , getconf -, flint +, flint3 , ntl , cddlib , gfan @@ -13,10 +13,7 @@ , doxygen , graphviz , latex2html -# upstream generates docs with texinfo 4. later versions of texinfo -# use letters instead of numbers for post-appendix chapters, and we -# want it to match the upstream format because sage depends on it. -, texinfo4 +, texinfo , texliveSmall , enableDocs ? !stdenv.isDarwin , enableGfanlib ? true @@ -24,7 +21,7 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.3.2p2"; + version = "4.3.2p16"; # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { @@ -34,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-dtZmN8xUCZ9eSgmtBxqfJeWsM4W5Baq7xWXuNAxNLjA="; + sha256 = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are @@ -68,7 +65,7 @@ stdenv.mkDerivation rec { ncurses readline ntl - flint + flint3 lrcalc gfan ] ++ lib.optionals enableGfanlib [ @@ -85,7 +82,7 @@ stdenv.mkDerivation rec { doxygen graphviz latex2html - texinfo4 + texinfo texliveSmall ] ++ lib.optionals stdenv.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index b2a76f5fb2526..6a0aafad3e914 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.24.3"; + version = "8.0.1"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-0gyCO5t8t0SbOCBClVVu+C2VpBlxsnoRHBRYgI8nNO4="; + hash = "sha256-pjk9+VRWrFIoHolIEEWlRx89hifLNeFtIi34F1OBD38="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index a029f5440b251..d071c90562cd4 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,7 +1,9 @@ { mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, + autoAddDriverRunpath, config, - cudaSupport ? config.cudaSupport, cudaPackages }: + cudaSupport ? config.cudaSupport, cudaPackages +}: assert cudaSupport -> cudaPackages != { }; @@ -37,7 +39,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ - cudaPackages.autoAddOpenGLRunpathHook + autoAddDriverRunpath ]; meta = with lib; { diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 9b4c711aba8f2..7919dfd176828 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.20240112164112"; + version = "3.1.20240404144621"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; rev = "refs/tags/${version}"; - hash = "sha256-Y0DORypXlTDv04qh796oXPSTxCXGb7rLQ8Su+/As7Lo="; + hash = "sha256-atpXkMIQ60POuUk99uiiuCoRXt4Seg11g/eHCeTDe+Q="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index f4aaac1a38234..1d42600d9770d 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "sha256-fqxAsnpMYCYj0hW2oxu/NH4PqesRlWPs5eDSeSjy1aU="; + sha256 = "sha256-ArT+g3GbtSxq3FvRi1H4z/kpsmcFCmKhzEJI4bCK44E="; }; patches = [ diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 628b40cd13008..e543c10d4bcbf 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.4.12"; + version = "8.10.7"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us="; + hash = "sha256-tRjyv7pTTTDj3LrcIP3OWOX+9FldHV6rtbPdOYr70E4="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' @@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec { snakemake-interface-executor-plugins snakemake-interface-common snakemake-interface-storage-plugins + snakemake-interface-report-plugins stopit tabulate throttler diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index db27bb188cf5e..b881d339300c4 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -7,7 +7,7 @@ , blas , lapack , cmake -, cudaPackages +, autoAddDriverRunpath , pkg-config # Available list of packages can be found near here: # @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config # Although not always needed, it is needed if cmakeFlags include # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - cudaPackages.autoAddOpenGLRunpathHook + autoAddDriverRunpath ]; passthru = { diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index 15d2e156a5899..3013ce74a334b 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.1.3"; + version = "3.1.4"; # 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-22yH3zAD479TRNS3XSqy6PuuLqyWmjvwScUTVfKumzY="; + hash = "sha256-VgD6ditMDpHki7l23Gjip2roA8Oi4MGpxl+4gSLTEFs="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/applications/system/asusctl/Cargo.lock index b8840ff7d5af7..65c286d0219e5 100644 --- a/pkgs/applications/system/asusctl/Cargo.lock +++ b/pkgs/applications/system/asusctl/Cargo.lock @@ -104,9 +104,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -164,9 +164,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arboard" @@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "5.0.7" +version = "5.0.10" dependencies = [ "asusd", "cargo-husky", @@ -213,20 +213,21 @@ dependencies = [ "rog_platform", "rog_profiles", "tinybmp", + "tokio", "toml 0.5.11", ] [[package]] name = "asusd" -version = "5.0.7" +version = "5.0.10" dependencies = [ - "async-trait", "cargo-husky", "concat-idents", "config-traits", "dmi_id", "env_logger", "futures-lite 1.13.0", + "inotify", "log", "logind-zbus", "rog_anime", @@ -243,7 +244,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "config-traits", @@ -289,7 +290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", + "event-listener 4.0.3", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -301,11 +302,11 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "slab", ] @@ -343,18 +344,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.3.2", + "rustix 0.38.30", "slab", "tracing", "windows-sys 0.52.0", @@ -371,11 +372,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite", ] @@ -404,7 +405,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.30", "windows-sys 0.48.0", ] @@ -416,7 +417,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -425,13 +426,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.0", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.30", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -439,19 +440,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -546,17 +547,17 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cexpr", "clang-sys", "lazy_static", @@ -567,7 +568,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -578,9 +579,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -626,11 +627,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel 2.1.1", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "piper", "tracing", ] @@ -658,7 +659,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -745,9 +746,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec", "target-lexicon", @@ -790,9 +791,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -832,7 +833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -846,7 +847,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "log", @@ -899,13 +900,13 @@ dependencies = [ [[package]] name = "cpuctl" -version = "5.0.7" +version = "5.0.10" [[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", ] @@ -921,12 +922,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -940,9 +938,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1026,7 +1024,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "5.0.7" +version = "5.0.10" dependencies = [ "log", "udev", @@ -1165,14 +1163,14 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1242,9 +1240,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.1" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1257,7 +1255,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.1", + "event-listener 4.0.3", "pin-project-lite", ] @@ -1278,9 +1276,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7caf4086251adeba90011a7ff9bd1f6d7f7595be0871867daa4dbb0fcf2ca932" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1387,9 +1385,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -1406,7 +1404,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -1519,9 +1517,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1826,9 +1824,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -1853,16 +1851,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1941,13 +1939,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix 0.38.28", - "windows-sys 0.48.0", + "rustix 0.38.30", + "windows-sys 0.52.0", ] [[package]] @@ -2049,9 +2047,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libloading" @@ -2069,7 +2067,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] @@ -2080,7 +2078,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] @@ -2115,9 +2113,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2169,9 +2167,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2405,7 +2403,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -2610,15 +2608,15 @@ checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81" [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "png" -version = "0.17.10" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2655,14 +2653,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.30", "tracing", "windows-sys 0.52.0", ] @@ -2715,9 +2713,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2733,9 +2731,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2807,9 +2805,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -2819,9 +2817,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", @@ -2836,7 +2834,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rog-control-center" -version = "5.0.7" +version = "5.0.10" dependencies = [ "asusd", "cargo-husky", @@ -2869,7 +2867,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "dmi_id", @@ -2886,7 +2884,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "dmi_id", @@ -2900,7 +2898,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "5.0.7" +version = "5.0.10" dependencies = [ "asusd", "cargo-husky", @@ -2913,7 +2911,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "concat-idents", @@ -2930,7 +2928,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "5.0.7" +version = "5.0.10" dependencies = [ "cargo-husky", "log", @@ -2944,7 +2942,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "5.0.7" +version = "5.0.10" dependencies = [ "glam", "log", @@ -2960,7 +2958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.4.1", + "bitflags 2.4.2", "serde", "serde_derive", ] @@ -3012,14 +3010,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -3088,35 +3086,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -3125,13 +3123,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3195,9 +3193,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smithay-client-toolkit" @@ -3286,7 +3284,7 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "supergfxctl" version = "5.1.2" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#af23df7596712bb9433a3be917febadeb3f1f419" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#a54163c4ced0f58dbbc134392d8a2118ee6c5c64" dependencies = [ "log", "logind-zbus", @@ -3311,9 +3309,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -3345,9 +3343,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri-winrt-notification" @@ -3361,44 +3359,44 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.28", - "windows-sys 0.48.0", + "rustix 0.38.30", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3492,7 +3490,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3568,7 +3566,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] @@ -3658,9 +3656,9 @@ dependencies = [ [[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" @@ -3985,7 +3983,7 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] @@ -3999,6 +3997,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-implement" version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4255,9 +4262,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.30" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -4400,7 +4407,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.48", ] [[package]] diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 47da8bd63b48d..ba18d23889018 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -13,22 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "5.0.7"; + version = "5.0.10"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-thTzNB6GmzHG0BaaacmmQogRrLK1udkTYifEivwDtjM="; + hash = "sha256-H8x3nfOFRv9DkbDkFw+LO1tdHiVyU3SzetqED4twPSk="; }; - cargoHash = ""; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI="; "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs="; - "supergfxctl-5.1.2" = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg="; + "supergfxctl-5.1.2" = "sha256-WDbUgvWExk5cs2cpjo88CiROdEbc01o2DELhRi9gju4="; }; }; diff --git a/pkgs/applications/system/coolercontrol/Cargo.lock b/pkgs/applications/system/coolercontrol/Cargo.lock index 2a81c7a8916e2..a5b28c64c0bc5 100644 --- a/pkgs/applications/system/coolercontrol/Cargo.lock +++ b/pkgs/applications/system/coolercontrol/Cargo.lock @@ -58,18 +58,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arboard" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" dependencies = [ "clipboard-win", - "core-graphics", + "core-graphics 0.23.1", "image", "log", "objc", @@ -77,7 +77,8 @@ dependencies = [ "objc_id", "parking_lot", "thiserror", - "winapi", + "windows-sys 0.48.0", + "wl-clipboard-rs", "x11rb", ] @@ -99,13 +100,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -158,9 +159,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -168,8 +169,8 @@ dependencies = [ "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.2", - "rustix 0.38.30", + "polling 3.5.0", + "rustix 0.38.31", "slab", "tracing", "windows-sys 0.52.0", @@ -191,7 +192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -208,7 +209,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -220,7 +221,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -229,13 +230,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.30", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -255,7 +256,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -289,14 +290,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "auto-launch" -version = "0.5.0" +name = "atty" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "dirs", - "thiserror", - "winreg 0.10.1", + "hermit-abi 0.1.19", + "libc", + "winapi", ] [[package]] @@ -349,9 +350,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -417,15 +418,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" + +[[package]] +name = "bytecount" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -510,9 +517,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -526,15 +533,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -544,14 +551,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" [[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex", + "indexmap 1.9.3", + "strsim", + "termcolor", + "textwrap", +] + +[[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 = "clipboard-win" -version = "4.5.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -564,8 +593,8 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", "libc", "objc", ] @@ -617,14 +646,13 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "coolercontrol" -version = "1.1.1" +version = "1.2.2" dependencies = [ - "portpicker", + "rand 0.8.5", "serde", "serde_json", "tauri", "tauri-build", - "tauri-plugin-autostart", "tauri-plugin-localhost", "tauri-plugin-single-instance", "tauri-plugin-store", @@ -656,7 +684,20 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -682,9 +723,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -757,7 +798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -767,14 +808,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] name = "darling" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" dependencies = [ "darling_core", "darling_macro", @@ -782,27 +823,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -827,6 +868,17 @@ dependencies = [ ] [[package]] +name = "derive-new" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -850,15 +902,6 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] name = "dirs-next" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -869,17 +912,6 @@ dependencies = [ ] [[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -897,6 +929,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[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" @@ -926,9 +973,9 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.8", + "toml 0.8.10", "vswhom", - "winreg 0.51.0", + "winreg", ] [[package]] @@ -948,9 +995,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -958,13 +1005,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -985,13 +1032,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "event-listener" @@ -1022,6 +1065,17 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +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" @@ -1032,6 +1086,16 @@ dependencies = [ ] [[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.1.0", + "pin-project-lite", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1048,9 +1112,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1078,6 +1142,12 @@ dependencies = [ ] [[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] name = "flate2" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1099,7 +1169,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.49", ] [[package]] @@ -1109,6 +1200,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] name = "form_urlencoded" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1195,7 +1292,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -1347,12 +1444,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -1473,7 +1570,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -1572,9 +1669,18 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +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.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hex" @@ -1632,9 +1738,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[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", @@ -1689,7 +1795,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "same-file", "walkdir", "winapi-util", @@ -1722,9 +1828,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1755,7 +1861,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.6", "libc", "windows-sys 0.48.0", ] @@ -1823,9 +1929,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -1881,15 +1987,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1902,12 +2008,22 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "libredox" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -1929,9 +2045,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2033,10 +2149,16 @@ 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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -2086,6 +2208,7 @@ dependencies = [ "cfg-if", "libc", "memoffset 0.7.1", + "pin-utils", ] [[package]] @@ -2095,6 +2218,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[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 = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2105,10 +2238,16 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -2119,7 +2258,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.6", "libc", ] @@ -2219,6 +2358,22 @@ dependencies = [ ] [[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2291,6 +2446,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.3", +] + +[[package]] name = "phf" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2394,7 +2559,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -2449,9 +2614,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" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" @@ -2460,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ "base64 0.21.7", - "indexmap 2.1.0", + "indexmap 2.2.3", "line-wrap", "quick-xml", "serde", @@ -2469,9 +2634,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2498,28 +2663,19 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.31", "tracing", "windows-sys 0.52.0", ] [[package]] -name = "portpicker" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" -dependencies = [ - "rand 0.8.5", -] - -[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2579,9 +2735,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2713,13 +2869,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -2734,9 +2890,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -2786,14 +2942,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -2805,9 +2961,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safemem" @@ -2858,39 +3014,40 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ + "indexmap 2.2.3", "itoa 1.0.10", "ryu", "serde", @@ -2904,7 +3061,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -2918,16 +3075,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -2935,14 +3093,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -3040,9 +3198,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -3104,12 +3262,6 @@ 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 = "string_cache" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3154,9 +3306,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -3182,25 +3334,25 @@ version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ - "cfg-expr 0.15.6", + "cfg-expr 0.15.7", "heck 0.4.1", "pkg-config", - "toml 0.8.8", + "toml 0.8.10", "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.16.5" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" +checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce" dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -3268,13 +3420,15 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri" -version = "1.5.4" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af" +checksum = "f078117725e36d55d29fafcbb4b1e909073807ca328ae8deb8c0b3843aac0fed" dependencies = [ "anyhow", + "clap", "cocoa", "dirs-next", + "dunce", "embed_plist", "encoding_rs", "flate2", @@ -3373,22 +3527,9 @@ dependencies = [ ] [[package]] -name = "tauri-plugin-autostart" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" -dependencies = [ - "auto-launch", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] name = "tauri-plugin-localhost" version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=c6a5b7ae479eaa598db2430a87fe32a3429198bf#c6a5b7ae479eaa598db2430a87fe32a3429198bf" dependencies = [ "http 1.0.0", "log", @@ -3402,7 +3543,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=c6a5b7ae479eaa598db2430a87fe32a3429198bf#c6a5b7ae479eaa598db2430a87fe32a3429198bf" dependencies = [ "log", "serde", @@ -3416,7 +3557,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=c6a5b7ae479eaa598db2430a87fe32a3429198bf#c6a5b7ae479eaa598db2430a87fe32a3429198bf" dependencies = [ "log", "serde", @@ -3427,11 +3568,11 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +version = "0.1.1" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=c6a5b7ae479eaa598db2430a87fe32a3429198bf#c6a5b7ae479eaa598db2430a87fe32a3429198bf" dependencies = [ "bincode", - "bitflags 2.4.1", + "bitflags 2.4.2", "log", "serde", "serde_json", @@ -3462,9 +3603,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158" +checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f" dependencies = [ "arboard", "cocoa", @@ -3483,9 +3624,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db" +checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21" dependencies = [ "brotli", "ctor", @@ -3523,14 +3664,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -3546,6 +3686,21 @@ dependencies = [ ] [[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] name = "thin-slice" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3553,22 +3708,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -3594,12 +3749,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa 1.0.10", + "num-conv", "powerfmt", "serde", "time-core", @@ -3614,10 +3770,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -3650,9 +3807,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -3683,14 +3840,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.6", ] [[package]] @@ -3708,24 +3865,24 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.1", ] [[package]] @@ -3747,7 +3904,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", ] [[package]] @@ -3790,10 +3947,24 @@ dependencies = [ ] [[package]] +name = "tree_magic_mini" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" +dependencies = [ + "bytecount", + "fnv", + "lazy_static", + "nom", + "once_cell", + "petgraph", +] + +[[package]] name = "treediff" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5" dependencies = [ "serde_json", ] @@ -3817,9 +3988,9 @@ dependencies = [ [[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" @@ -3838,9 +4009,9 @@ dependencies = [ [[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 = "url" @@ -3862,9 +4033,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom 0.2.12", ] @@ -3943,9 +4114,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3953,24 +4124,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3978,22 +4149,95 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.49", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.31", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix 0.38.31", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] [[package]] name = "webkit2gtk" @@ -4082,9 +4326,9 @@ dependencies = [ [[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" @@ -4112,15 +4356,6 @@ dependencies = [ ] [[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - -[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4420,20 +4655,20 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" dependencies = [ - "winapi", + "memchr", ] [[package]] @@ -4447,6 +4682,26 @@ dependencies = [ ] [[package]] +name = "wl-clipboard-rs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa" +dependencies = [ + "derive-new", + "libc", + "log", + "nix", + "os_pipe", + "tempfile", + "thiserror", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + +[[package]] name = "wry" version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4455,7 +4710,7 @@ dependencies = [ "base64 0.13.1", "block", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", @@ -4507,52 +4762,47 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "gethostname", - "nix", - "winapi", - "winapi-wsapoll", + "rustix 0.38.31", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix", -] +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xattr" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.12", - "rustix 0.38.30", + "linux-raw-sys 0.4.13", + "rustix 0.38.31", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "c45d06ae3b0f9ba1fb2671268b975557d8f5a84bb5ec6e43964f87e763d8bca8" dependencies = [ "async-broadcast", "async-executor", @@ -4591,9 +4841,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "b4a1ba45ed0ad344b85a2bb5a1fe9830aed23d67812ea39a586e7d0136439c7d" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 2e9e9699d074d..c56f6bf427a64 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-autostart-0.0.0" = "sha256-ATw3dbvG3IsLaLBg5wGk7hVRqipwL4xPGKdtD9a5VIw="; + "tauri-plugin-localhost-0.1.0" = "sha256-z+cxkNtaaV7m7Rt2mpdw0Rm0oDR4VZPKwtdhY5V/HlI="; }; }; diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index 96cd6f9bf3fa7..dddf459163371 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -11,7 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-7Hd1LT1ro83QMuoDGvFGsrTlQaSia+lVG8lyaAibiAo="; + npmDepsHash = "sha256-ZnuTtksB+HVYobL48S3RI8Ibe3pvDaF+YFAJJumiNxA="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index 087fa4ad215eb..96ca8613de254 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -2,6 +2,7 @@ , buildNpmPackage , testers , coolercontrol +, runtimeShell }: { version @@ -14,13 +15,17 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrold"; - cargoHash = "sha256-Ybqr36AkcPnGJeFcCqg/zuWcaooZ1gJPCi5IbgXmeJ0="; + cargoHash = "sha256-qXZ/LXbKkLvnEQibGyMvkkYhz2eEGUHsYxVF3EbCpFc="; - # copy the frontend static resources to a directory for embedding postPatch = '' + # copy the frontend static resources to a directory for embedding mkdir -p ui-build cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"' + + # Hardcode a shell + substituteInPlace src/repositories/utils.rs \ + --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")' ''; postInstall = '' diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 6562da13d3995..14375495f34a9 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.1.1"; + version = "1.2.2"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-QgUYfiiADKVHqOU9WTv+VAqep0IU6Ezy8ZzJwkdHIJQ="; + hash = "sha256-c+MM8MAM8WSKSKECSfy/Iw7KWiWHxG75YShtv9d2Sjc="; }; meta = with lib; { diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 7a4db20a50323..1aaf202c9f14e 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.4.0.3"; + version = "3.4.0.5"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg="; + hash = "sha256-Ho4vcmTEVja7rkgLSfNkXvnpopYupRxPL1UVlnmdGCg="; }; # 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 ca3c5e0faef70..2ad01f2aa26f1 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-GUNMA4CRO4cKBjNr7i8yRflstbT8g2ciDHppjUUbAOc="; + sha256 = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; fetchSubmodules = true; }; diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2141d9246daeb..16f46cb0f8ada 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Nn/G7SkRuHXRSRgNjlmdX1G07sp7FPx8UyAn63Nivfg="; + hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A="; }; - cargoHash = "sha256-vCoKaDd0mQRF6NNfK679FhEXuAdn/1o3F1gTfT8NK+0="; + cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 0872a75254fea..5b8e0078d75cf 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -18,9 +18,8 @@ , libgee , callPackage , python3 -, gtk3 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook4 , sixelSupport ? false }: @@ -48,6 +47,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs build-aux/meson/postinstall.py ''; @@ -57,9 +58,8 @@ stdenv.mkDerivation rec { pkg-config vala sassc - wrapGAppsHook + wrapGAppsHook4 python3 - gtk3 # For gtk-update-icon-cache desktop-file-utils # For update-desktop-database ]; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 9f6cba1d55f15..44f38a99a528d 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.16.2"; + version = "1.17.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -40,7 +40,7 @@ let src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; - hash = "sha256-NvkKJ75n/OzgEd2WHX1NQIXPn9R0Z+YI1rpFmNxaDhk="; + hash = "sha256-/KykHPqM0WQ1HO83bOrxJ88mvEAf0Ah3S8gSvKb3AJM="; }; dontUnpack = true; @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM="; + hash = "sha256-p+qaWHBrUn6YpNyAmQf6XoQyO3degHP5oMN53/9gIr4="; }; separateDebugInfo = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index c12891b98e4f9..675e47e5f57ac 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -31,20 +31,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.33.0"; + version = "0.34.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-0bdDolaFbVI3CqcOtKFrvRqrKXIiSIfH5rxJgK5XssI="; + hash = "sha256-r7KZcSqREILMp0F9ajeHS5sglq/o88h2t+4BgbABjOY="; }; goModules = (buildGo122Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-7301wHGCXUdfPFOhgLEJILmYxNohNm6H2zXGd9W11Wk="; + vendorHash = "sha256-HNE0MWjL0PH20Glzb0GV6+lQu/Lslx8k/+YvlLHbHww="; }).goModules; buildInputs = [ @@ -234,7 +234,7 @@ buildPythonApplication rec { ''; passthru = { - tests = lib.mkIf stdenv.isLinux { + tests = lib.optionalAttrs stdenv.isLinux { default = nixosTests.terminal-emulators.kitty; }; updateScript = nix-update-script {}; @@ -250,6 +250,6 @@ buildPythonApplication rec { ]; platforms = platforms.darwin ++ platforms.linux; mainProgram = "kitty"; - maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens kashw2 ]; + maintainers = with maintainers; [ tex rvolosatovs Luflosi kashw2 ]; }; } diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 86b0657e0c039..72a6835ff4aaa 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -12,15 +12,17 @@ , patches ? [ ] , extraLibs ? [ ] , nixosTests +# update script dependencies +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "st"; - version = "0.9"; + version = "0.9.2"; src = fetchurl { url = "https://dl.suckless.org/st/st-${finalAttrs.version}.tar.gz"; - hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc="; + hash = "sha256-ayFdT0crIdYjLzDyIRF6d34kvP7miVXd77dCZGf5SUs="; }; outputs = [ "out" "terminfo" ]; @@ -60,13 +62,18 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "PREFIX=$(out)" ]; - passthru.tests.test = nixosTests.terminal-emulators.st; + passthru = { + tests.test = nixosTests.terminal-emulators.st; + updateScript = gitUpdater { + url = "git://git.suckless.org/st"; + }; + }; meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; - maintainers = with maintainers; [ andsild ]; + maintainers = with maintainers; [ qusic ]; platforms = platforms.unix; mainProgram = "st"; }; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 6bae150c97b82..303c6d1b77da5 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig , pkg-config, makeWrapper, nixosTests, gitUpdater -, nixfmt, nix, gnused, coreutils, enableDecLocator ? true }: +, nix, gnused, coreutils, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; diff --git a/pkgs/applications/version-management/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix index 0cbc04b7bcc23..b0ed32eb02227 100644 --- a/pkgs/applications/version-management/cgit/common.nix +++ b/pkgs/applications/version-management/cgit/common.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { inherit pname version src gitSrc; + separateDebugInfo = true; + nativeBuildInputs = [ pkg-config asciidoc ] ++ (with python3Packages; [ python wrapPython ]); diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index bb1c3243d6dbb..7b573717c003d 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.18.4"; + version = "3.22.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ODBlNwrvkYnZ+CvKyc5Bic6DK/z8d6/KR3+iarFxduE="; + hash = "sha256-wDxhhPYElNPimVa+wX6AnTZrZOhWjuMzNJ6urn0wruk="; }; pythonRelaxDeps = [ @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { pytest-freezer pytest-mock pytest-regressions - pytestCheckHook + pytest7CheckHook ]; doCheck = true; diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 3065d56721939..b343e473e3c8b 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec { etc/completion/completion.{bash,fish,zsh} ''; + # test_env_parsing_with_pager_set_to_bat sets environment variables, + # which can be flaky with multiple threads: + # https://github.com/dandavison/delta/issues/1660 + dontUseCargoParallelTests = true; + checkFlags = lib.optionals stdenv.isDarwin [ "--skip=test_diff_same_non_empty_file" ]; diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index c76b6ee984082..65c683ddbe763 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-I7eq9PB2Od7aaji+VrZj05VVCsGtCiXEMy88xrA8Ktg="; + npmDepsHash = "sha256-uMPy4cqMDNZTpF+pk7YibXEJO1zxVfwlCeFzGgJBiU0="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,33 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.7-0"; + version = "1.21.11-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k="; + hash = "sha256-7oYsoZpZcNIUw3iXSi1Q5So2yYgKnT5U7GHQ4NVqVdc="; + # Forgejo has multiple different version strings that need to be provided + # via ldflags. main.ForgejoVersion for example is a combination of a + # hardcoded gitea compatibility version string (in the Makefile) and + # git describe and is easiest to get by invoking the Makefile. + # So we do that, store it the src FOD to then extend the ldflags array + # in preConfigure. + # The `echo -e >> Makefile` is temporary and already part of the next + # major release. Furthermore, the ldflags will change next major release + # and need to be updated accordingly. + leaveDotGit = true; + postFetch = '' + cd "$out" + echo -e 'show-version-full:\n\t@echo ''${FORGEJO_VERSION}' >> Makefile + make show-version-full > FULL_VERSION + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; - vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4="; + vendorHash = "sha256-OuWNF+muWM6xqwkFxLIUsn/huqXj2VKg8BN9+JHVw58="; subPackages = [ "." ]; @@ -59,11 +75,11 @@ buildGoModule rec { buildInputs = lib.optional pamSupport pam; patches = [ - ./../gitea/static-root-path.patch + ./static-root-path.patch ]; postPatch = '' - substituteInPlace modules/setting/setting.go --subst-var data + substituteInPlace modules/setting/server.go --subst-var data ''; tags = lib.optional pamSupport "pam" @@ -76,6 +92,10 @@ buildGoModule rec { "-X 'main.Tags=${lib.concatStringsSep " " tags}'" ]; + preConfigure = '' + export ldflags+=" -X code.gitea.io/gitea/routers/api/forgejo/v1.ForgejoVersion=$(cat FULL_VERSION) -X main.ForgejoVersion=$(cat FULL_VERSION)" + ''; + preBuild = '' go run build/merge-forgejo-locales.go ''; diff --git a/pkgs/applications/version-management/forgejo/static-root-path.patch b/pkgs/applications/version-management/forgejo/static-root-path.patch new file mode 100644 index 0000000000000..7f70329c60407 --- /dev/null +++ b/pkgs/applications/version-management/forgejo/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git a/modules/setting/server.go b/modules/setting/server.go +index 183906268..fa02e8915 100644 +--- a/modules/setting/server.go ++++ b/modules/setting/server.go +@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) { + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() + if len(StaticRootPath) == 0 { +- StaticRootPath = AppWorkPath ++ StaticRootPath = "@data@" + } + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath) + StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 6883196756270..7a9a01ea255bc 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-WQjzkykKtrXfkNSWcM9GWy8LPMwxJpSbnWjpmslP0HA="; + hash = "sha256-KsuuwFKdpXHDVAZZ2JiX781mgqDQyyEILo4lmNn+8YE="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 129ae0854bd5f..a5f0fc2cb2ba6 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.45.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-jztBWn/1bDTxR/q27RYJM6boFWyduTKAtIn5zIZK2tU="; + hash = "sha256-8vQQzLGb1cHeNJC/aUZbROfRoUtuujEKoLWBgLZnhls="; }; - vendorHash = "sha256-FprVBvYPGWLcUKlWg9JU7yy2KDa/3rceAEHUIYHN4f8="; + vendorHash = "sha256-rQtRBXhG5fF+3cIIv9i5r8Kd9YeIq/aDLAw8Rqxn6ww="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index f23fd8b441ac9..da0fe83bf8248 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.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-l+Ycts7PSKR72GsHJ1zWqpyd0BMMib/GTUv+B0x6d8M="; + sha256 = "sha256-fp/pqLpuEqvLoB3ioDd1Kx+i1NUI+bUDJzdaT7dQGSg="; }; - vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg="; + vendorHash = "sha256-M9B19rSEMnmT4wfOVnSAK06UPR/xrs0252lX3B9ebF8="; doCheck = false; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 13dcac9fde6d8..a3f8c5430d3ed 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.12"; + version = "0.6.13"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA="; + hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0="; + cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac="; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index a8041f2698bb9..d214f7b90608a 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , git , libiconv , ncurses @@ -23,6 +24,19 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY="; }; + patches = [ + # Fix tests with Git 2.44.0+ + (fetchpatch { + url = "https://github.com/arxanas/git-branchless/pull/1245.patch"; + hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw="; + }) + # Fix tests with Git 2.44.0+ + (fetchpatch { + url = "https://github.com/arxanas/git-branchless/pull/1161.patch"; + hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y="; + }) + ]; + cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index b8b2a28a7795a..817394cdc5708 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-5NWMpdrOWQcA3cxd5WNtnamnSMuZU3BGEMlRZ8NR+NE="; + hash = "sha256-FRcreSnSO65m9h9+SUg4qdFELvpVX1+HkWH3dI2RR/M="; }; - cargoHash = "sha256-kIO3mD4SdQqlZYty8QWOBVvmaXujcEijeRONGYNZSng="; + cargoHash = "sha256-RlcZvyFi7fc8eJYB5X64axAnNp8Z1h0WOV4hM1SLoRk="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index 66d2439a00edd..c818874392af4 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "git-credential-oauth"; @@ -11,6 +11,8 @@ buildGoModule rec { hash = "sha256-bqyoAAqli0L6Kf+W1sTh2vmmfaIj2OdpQyvQZnYOWWA="; }; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" @@ -19,6 +21,10 @@ buildGoModule rec { vendorHash = "sha256-cCqbEv4kBnF6FWvfaXCOxadPVXR/AxXS3nXHf6WmsSs="; + postInstall = '' + installManPage $src/git-credential-oauth.1 + ''; + meta = { description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; homepage = "https://github.com/hickford/git-credential-oauth"; diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 176e271475368..f450b17535dd8 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -12,10 +12,9 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' - # unknown lint: `ffi_unwind_calls` - # note: the `ffi_unwind_calls` lint is unstable - substituteInPlace src/main.rs src/{config,core,display,input,git,runtime,todo_file,testutils,view}/src/lib.rs \ - --replace "ffi_unwind_calls," "" + # error: lint `unused_tuple_struct_fields` has been renamed to `dead_code` + substituteInPlace scripts/data/lints.rs src/main.rs src/{config,core,display,git,input,runtime,testutils,todo_file,view}/src/lib.rs \ + --replace-fail "unused_tuple_struct_fields," "" ''; cargoLock = { diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index a038435b8d60e..3c97c1e2024b2 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.24.2"; + version = "3.25.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-nxfSdgGF/hDFf7KIJ+tqCvxEi1GOjTAbpcJylIqhd/M="; + hash = "sha256-tLEuSwM8X0+oQDB9fmj5OQsC7iA906EQZz3yvB6rXfk="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index bc59aa6ffda16..ff1f8e98a79d0 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.191"; + version = "5.12.196"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-aSEoAs0s7zyALf3s77eVlrjkCrn7ihW/4OW5hN8YL8k="; + hash = "sha256-vv60+8H6WQes+xVJRsgLppwQ/DkQbfNC6tRx2TB/4HQ="; }; - cargoHash = "sha256-pm+XreLGxZJKRcrmU1ooMjN7MTRJqgKOy2J1OqdodxE="; + cargoHash = "sha256-jK2GTI+T7Ie5cdQQQHh2aj6Egb/5BxsfJkFrSo+z7Pc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index e989e03ca1cfb..a7d0f49344a04 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.39"; + version = "2.45"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-Qw0x/YiXMDrlTy6boembfqVRvEYiMWOALJtaMrr7/WI="; + hash = "sha256-f765TcOHL8wdPa9qSmGegofjCXx1tF/K5bRQnYQcYVc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch index efc3d2b1f8a5e..43e879a8ba174 100644 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch @@ -18,11 +18,13 @@ diff --git a/repo b/repo index 8b05def..f394b3e 100755 --- a/repo +++ b/repo -@@ -236,6 +236,7 @@ import optparse +@@ -236,8 +236,9 @@ import optparse import re import shutil import stat +import ssl + import urllib.error + import urllib.request if sys.version_info[0] == 3: import urllib.request diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index e32d89c042ca2..2f7defa3ee55c 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { pname = "git-review"; - version = "2.3.1"; + version = "2.4.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -18,9 +18,9 @@ buildPythonApplication rec { src = fetchFromGitea { domain = "opendev.org"; owner = "opendev"; - repo = pname; + repo = "git-review"; rev = version; - sha256 = "sha256-C8M4b/paHJB9geizc1eIhXsTuLeeS4dDisCfCQF1RuU="; + hash = "sha256-UfYc662NqnQt0+CKc+18jXnNTOcZv8urCNBsWd6x0VQ="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index ca63fb9b4c1ef..1efcf23600be1 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 = "11.1.0"; + version = "14.1.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-QQ+sIZzkzecs+pZBzsmCL048JZpMPvdYi0PRtMN4AhY="; + hash = "sha256-BhtKl052P3PGxGXb5lSOIsncJLiNlevzBMEF2kCuFpM="; }; vendorHash = null; @@ -32,8 +32,6 @@ buildGoModule rec { let skippedTests = [ "TestGodog" - "TestRunner_CreateChildFeatureBranch" - "TestShellRunner_RunStringWith_Dir" "TestMockingShell_MockCommand" "TestShellRunner_RunStringWith_Input" ]; @@ -56,14 +54,14 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = git-town; command = "git-town --version"; - version = "v${version}"; + inherit version; }; meta = with lib; { description = "Generic, high-level git support for git-flow workflows"; homepage = "https://www.git-town.com/"; license = licenses.mit; - maintainers = with maintainers; [ allonsy blaggacao ]; + maintainers = with maintainers; [ allonsy blaggacao gabyx ]; mainProgram = "git-town"; }; } diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 851cb8464c5b2..5f91aacf63d8a 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { nativeCheckInputs = [ git - pythonPackages.pytestCheckHook + pythonPackages.pytest7CheckHook ]; # 1. git fails to run as it cannot detect the email address, so we set it diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 767172787fba7..8f57c97230fbd 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.43.2"; + version = "2.44.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-9hLBq8Y1V9UK04SYY/yRCWcBOfyZAeV0Rg7HbgURrbk="; + hash = "sha256-41hzjctbXqNAzpAKABXAOuhugE5/9k5HqkYx3e5oHeM="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -318,25 +318,20 @@ stdenv.mkDerivation (finalAttrs: { disable_test t0001-init 'shared overrides system' disable_test t0001-init 'init honors global core.sharedRepository' disable_test t1301-shared-repo - # git-completion.bash: line 405: compgen: command not found: - disable_test t9902-completion 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' + # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found + disable_test t9902-completion # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks - - ${lib.optionalString (!sendEmailSupport) '' - # Disable sendmail tests - disable_test t9001-send-email - ''} - + '' + lib.optionalString (!sendEmailSupport) '' + # Disable sendmail tests + disable_test t9001-send-email + '' + '' # XXX: I failed to understand why this one fails. # Could someone try to re-enable it on the next release ? # Tested to fail: 2.18.0 and 2.19.0 disable_test t1700-split-index "null sha1" - # Tested to fail: 2.18.0 - disable_test t9902-completion "sourcing the completion script clears cached --options" - # Flaky tests: disable_test t5319-multi-pack-index disable_test t6421-merge-partial-clone @@ -345,12 +340,11 @@ stdenv.mkDerivation (finalAttrs: { disable_test t0021-conversion disable_test t3910-mac-os-precompose - ${lib.optionalString (!perlSupport) '' - # request-pull is a Bash script that invokes Perl, so it is not available - # when NO_PERL=1, and the test should be skipped, but the test suite does - # not check for the Perl prerequisite. - disable_test t5150-request-pull - ''} + '' + lib.optionalString (!perlSupport) '' + # request-pull is a Bash script that invokes Perl, so it is not available + # when NO_PERL=1, and the test should be skipped, but the test suite does + # not check for the Perl prerequisite. + disable_test t5150-request-pull '' + lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. @@ -358,8 +352,6 @@ stdenv.mkDerivation (finalAttrs: { # fail (as of 2.33.0) #===( 18623;1208 8/? 224/? 2/? )= =fatal: Not a valid object name refs/tags/signed-empty disable_test t6300-for-each-ref - #===( 22665;1651 9/? 1/? 0/? 0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found - disable_test t9902-completion # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 4cc1be3bd6427..4b2105fda93c0 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.21.8"; + version = "1.21.11"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-nJ357ckglXRcl205Cg4tg9ewmLn2MkKUDU3PpwBVlik="; + hash = "sha256-TxysXw3lVdV/hlILztM+D7wIpeqXfglAy7Ak2AxnlEM="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix deleted file mode 100644 index b16befcd080d1..0000000000000 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook -, makeWrapper -, gnome -, libsecret -, git -, curl -, nss -, nspr -, xorg -, libdrm -, alsa-lib -, cups -, mesa -, systemd -, openssl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "github-desktop"; - version = "3.3.6"; - rcversion = "3"; - arch = "amd64"; - - src = fetchurl { - url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${finalAttrs.rcversion}/GitHubDesktop-linux-${finalAttrs.arch}-${finalAttrs.version}-linux${finalAttrs.rcversion}.deb"; - hash = "sha256-900JhfHN78CuAXptPX2ToTvT9E+g+xRXqmlm34J9l6k="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - (wrapGAppsHook.override { inherit makeWrapper; }) - ]; - - buildInputs = [ - gnome.gnome-keyring - xorg.libXdamage - xorg.libX11 - libsecret - git - curl - nss - nspr - libdrm - alsa-lib - cups - mesa - openssl - ]; - - unpackPhase = '' - mkdir -p $TMP/${finalAttrs.pname} $out/{opt,bin} - cp $src $TMP/${finalAttrs.pname}.deb - ar vx ${finalAttrs.pname}.deb - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${finalAttrs.pname}/ - ''; - - installPhase = '' - cp -R $TMP/${finalAttrs.pname}/usr/share $out/ - cp -R $TMP/${finalAttrs.pname}/usr/lib/${finalAttrs.pname}/* $out/opt/ - ln -sf $out/opt/${finalAttrs.pname} $out/bin/${finalAttrs.pname} - ''; - - preFixup = '' - gappsWrapperArgs+=( - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" - ) - ''; - - runtimeDependencies = [ - (lib.getLib systemd) - ]; - - meta = { - description = "GUI for managing Git and GitHub."; - homepage = "https://desktop.github.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dan4ik605743 ]; - platforms = lib.platforms.linux; - mainProgram = "github-desktop"; - }; -}) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index cedf8791fa790..a3160f1ce3a53 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid +, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid , e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git , libGL, zlib, cacert }: @@ -106,7 +106,7 @@ let comment = "Graphical Git client from Axosoft"; }) ]; - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # avoid double-wrapping @@ -124,6 +124,10 @@ let runHook postInstall ''; + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") + ''; + postFixup = '' pushd $out/share/${pname} for file in gitkraken chrome-sandbox chrome_crashpad_handler; do diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index dddcdf5812d4e..09ef9a290d7ba 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.8.1", - "repo_hash": "sha256-95YdEAUYoFDFX4COI6NnI6tDB+NLnihlJdUDM8NixXA=", - "yarn_hash": "1yhl4l2dln9ck4nbjjrlyjx17nxk4h12gb5hqjh4dq3rz3az3jvx", + "version": "16.10.3", + "repo_hash": "sha256-JeZHnoNMk7NYBeUy25YK+f6K7WOeTQnYV/pG08bmiwA=", + "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.8.1-ee", + "rev": "v16.10.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.8.1", - "GITLAB_PAGES_VERSION": "16.8.1", - "GITLAB_SHELL_VERSION": "14.33.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.6.0", - "GITLAB_WORKHORSE_VERSION": "16.8.1" + "GITALY_SERVER_VERSION": "16.10.3", + "GITLAB_PAGES_VERSION": "16.10.3", + "GITLAB_SHELL_VERSION": "14.34.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", + "GITLAB_WORKHORSE_VERSION": "16.10.3" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 6c635aafe03ee..2e440e2b9766d 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -2,7 +2,7 @@ , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl , defaultGemConfig, buildRubyGem , gitlabEnterprise ? false, callPackage, yarn -, prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config +, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config , cargo, rustc, rustPlatform }: @@ -49,7 +49,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-I5w/roDgnRe5eyXo0wiRcoWPpXEtpL3kOl9eDg99t/w="; + hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y="; }; dontBuild = false; @@ -94,7 +94,7 @@ let sha256 = data.yarn_hash; }; - nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert prefetch-yarn-deps ]; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert fixup-yarn-lock ]; patches = [ # Since version 12.6.0, the rake tasks need the location of git, @@ -112,6 +112,8 @@ let GITLAB_LOG_PATH = "log"; FOSS_ONLY = !gitlabEnterprise; + SKIP_YARN_INSTALL = 1; + configurePhase = '' runHook preConfigure @@ -142,11 +144,7 @@ let buildPhase = '' runHook preBuild - bundle exec rake gettext:compile RAILS_ENV=production NODE_ENV=production - bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true runHook postBuild ''; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e6d9ce605b4c4..b0adadb93efc8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.8.1"; + version = "16.10.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,10 +18,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-yR8O9F6THymKKHbnfh67NhEcNNBz7XHja/fpeTmVoe0="; + hash = "sha256-WdEYZL3g/aYh2Iy1ZgJhIHgQ4967FOxhiuQEokk1S2A="; }; - vendorHash = "sha256-AkL/BbCrqgXyvfiMxzMIXeZwh5aFL2a2+myk/4YXMNc="; + vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; 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 bc4093e720008..c7f241aa0f426 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 = "3.88.0"; + version = "3.92.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-egslb+8+RsDjpL5xQpdCU3QwFH59grRCkODQnAkZe/0="; + hash = "sha256-NHpqfqv3RCbWZilhXLGnQTN+ytzifAix6mcLk5Bw124="; }; - vendorHash = "sha256-IFXIr0xYJCKM5VUHQV+4S/+FEAhFEjbMaU+9JWIh8cA="; + vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; patches = [ ./Disable-inmemory-storage-driver-test.patch 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 e3e607921345b..9b31c3b300a29 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.6.0"; + version = "4.8.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-HlT3Uj/DWbyK4xGq7SjKjZ90sww6oMiMDo05mtv6rTA="; + sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; }; - vendorHash = "sha256-YUH/agSy/shHmHRXlfDtgumbka6BjX5NTxgvlNJS4hQ="; + vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; 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 7cc4c1c863734..3d920be8966d6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.8.1"; + version = "16.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-Wj15GHm+5Xd5wq4C3dH+i94jh7pecHM6KCDugLm5YAA="; + hash = "sha256-mQNDnxdrM679ejjXZuqSV8SwLXFcKKKGOQt3DJWOZOo="; }; - vendorHash = "sha256-9yogTSdEij/YwWGm3gz7jMn2AZcI+o7aEnjBvJ8E3vA="; + vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; 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 ab79f9fac00a3..2b99cc36ba7ec 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.33.0"; + version = "14.34.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-0C3ODs2NElJQ+A6x9lZxSParTZc3q4YqWsw7DxwhODo="; + sha256 = "sha256-0LzZZn4kS5uRcj/uJgHvLvd6ZOLi1l4yaSqqRhmTYZs="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-sTAd/AbPx5WzBCzTDLvo/bDZcmz/xVhIhz9nFGBEYx4="; + vendorHash = "sha256-RtZ9d3cempY8PxaCPFJ2uEEorem6NDURHZPirr0SUjU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 58361fbfb6315..aa80f354b9854 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.8.1"; + version = "16.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-OcdfanSlH1ZUmKlhzMOD3oNySx1o92Is7EDf1Z3953A="; + vendorHash = "sha256-bbKX22Tb2pM+Wnyl1ojdA1nmT40Z5R99mDP1hLD+lco="; 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 161dc46f78449..dccd147ca501d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -24,11 +24,11 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'bootsnap', '~> 1.17.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'bootsnap', '~> 1.18.3', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory @@ -49,10 +49,10 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -134,21 +134,21 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 0.10.0', feature_category: :api +gem 'grape-entity', '~> 0.10.2', feature_category: :api gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api -gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api +gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.0.27', feature_category: :api +gem 'graphql', '~> 2.2.5', feature_category: :api gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.8.0', feature_category: :api gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api -gem 'graphlient', '~> 0.5.0', feature_category: :importers # Used by BulkImport feature (group::import) +gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data -gem 'ffaker', '~> 2.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -196,6 +196,10 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFea gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'googleauth', '~> 1.8.1', feature_category: :shared +gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared +gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared + # Seed data gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory @@ -203,15 +207,15 @@ 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.190.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.144.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 # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning -gem 'deckar01-task_list', '2.3.3', feature_category: :team_planning +gem 'deckar01-task_list', '2.3.4', feature_category: :team_planning gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -226,7 +230,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.11', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.13', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -236,7 +240,7 @@ 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' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack', '~> 2.2.8.1' # 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 @@ -252,7 +256,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', '~> 7.1.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory @@ -269,11 +273,11 @@ gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory # Linear-time regex library for untrusted regular expressions -gem 're2', '2.6.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 1.5', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 2.0', feature_category: :static_application_security_testing gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -284,19 +288,20 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis', '~> 4.8.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'redis-namespace', '~> 1.10.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-namespace', '~> 1.10.0', feature_category: :redis +gem 'redis', '~> 5.0.0', feature_category: :redis +gem 'redis-clustering', '~> 5.0.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory # Discord integration -gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations +gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations # Jira integration -gem 'jira-ruby', '~> 2.1.4', feature_category: :integrations -gem 'atlassian-jwt', '~> 0.2.0', feature_category: :integrations +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 @@ -336,8 +341,7 @@ gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCa gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sassc-rails', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'autoprefixer-rails', '10.2.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'cssbundling-rails', '1.4.0', feature_category: :shared gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory @@ -347,7 +351,7 @@ gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-license', '~> 2.4', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -360,20 +364,23 @@ gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking # PostgreSQL query parsing # -gem 'pg_query', '~> 4.2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg_query', '~> 5.1.0', feature_category: :database gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-labkit', '~> 0.35.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n gem 'rails-i18n', '~> 7.0', feature_category: :internationalization gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization -gem 'gettext', '~> 3.3', require: false, group: [:development, :test], feature_category: :internationalization +gem 'gettext', '~> 3.4', '>= 3.4.9', + require: false, + group: [:development, :test], + feature_category: :internationalization gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -388,12 +395,12 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Metrics gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'prometheus-client-mmap', '~> 1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do - gem 'lefthook', '~> 1.5.5', require: false, feature_category: :tooling + gem 'lefthook', '~> 1.5.6', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -407,11 +414,11 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling - gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling + gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling end group :development, :test do @@ -426,7 +433,7 @@ group :development, :test do gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec-rails', '~> 6.1.0', feature_category: :shared + gem 'rspec-rails', '~> 6.1.1', feature_category: :shared # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -446,7 +453,7 @@ group :development, :test do # Profiling data from CI/CD pipelines gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'knapsack', '~> 1.21.1', feature_category: :tooling + gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling @@ -469,7 +476,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.6.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.7.0', require: false, feature_category: :tooling end group :development, :test, :coverage do @@ -493,34 +500,34 @@ end group :test do gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling - gem 'os', '~> 1.1', feature_category: :tooling + gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.16' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling + gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling # 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.11.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling end -gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'octokit', '~> 8.0', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared @@ -552,14 +559,14 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gitaly +gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management +gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management -gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -572,7 +579,7 @@ gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared # Structured logging gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'grape_logging', '~> 1.8', feature_category: :api +gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory @@ -634,7 +641,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.0.24.pre.alpha1', feature_category: :remote_development +gem 'devfile', '~> 0.0.25.pre.alpha1', feature_category: :remote_development # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -652,4 +659,4 @@ gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-sdk', feature_category: :application_instrumentation +gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index adbd0b47167f1..e00e49f2f69e8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -34,6 +34,7 @@ PATH specs: gitlab-housekeeper (0.1.0) activesupport + awesome_print httparty rubocop @@ -178,6 +179,15 @@ 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) @@ -193,70 +203,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actionmailbox (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.0.8.1) + actionpack (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actiontext (7.0.8.1) + actionpack (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activestorage (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activesupport (= 7.0.8.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -292,8 +302,6 @@ GEM atlassian-jwt (0.2.1) jwt (~> 2.1) attr_required (1.0.1) - autoprefixer-rails (10.2.5.1) - execjs (> 0) awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.3.0) @@ -301,7 +309,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.190.2) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -309,8 +317,8 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.142.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.144.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -318,7 +326,7 @@ GEM axe-core-api (4.8.0) dumb_delegator virtus - axe-core-rspec (4.8.0) + axe-core-rspec (4.8.2) axe-core-api dumb_delegator virtus @@ -337,6 +345,7 @@ GEM babosa (2.0.0) backport (1.2.0) base32 (0.3.2) + base64 (0.2.0) batch-loader (2.0.1) bcrypt (3.1.18) benchmark (0.2.0) @@ -353,7 +362,7 @@ GEM bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.17.1) + bootsnap (1.18.3) msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) @@ -364,11 +373,11 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 1.0) byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -381,9 +390,8 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) ssrf_filter (~> 1.0, < 1.1.0) - cbor (0.5.9.6) - character_set (1.4.1) - sorted_set (~> 1.0) + cbor (0.5.9.8) + character_set (1.8.0) charlock_holmes (0.7.7) chef-config (18.3.0) addressable @@ -425,8 +433,10 @@ GEM git css_parser (1.14.0) addressable + cssbundling-rails (1.4.0) + railties (>= 6.0.0) cvss-suite (3.0.1) - danger (9.3.1) + danger (9.4.2) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -437,7 +447,7 @@ GEM kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 6.0) + octokit (>= 4.0) terminal-table (>= 1, < 4) danger-gitlab (8.0.0) danger @@ -451,8 +461,8 @@ GEM dead_end (3.1.1) deb_version (1.0.2) debug_inspector (1.1.0) - deckar01-task_list (2.3.3) - html-pipeline + deckar01-task_list (2.3.4) + html-pipeline (~> 2.0) declarative (0.0.20) declarative_policy (1.1.0) deprecation_toolkit (1.5.1) @@ -471,7 +481,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.24.pre.alpha1) + devfile (0.0.25.pre.alpha1) device_detector (1.0.0) devise (4.9.3) bcrypt (~> 3.0) @@ -489,7 +499,7 @@ GEM diffy (3.4.2) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - discordrb-webhooks (3.4.2) + discordrb-webhooks (3.5.0) rest-client (>= 2.0.0) docile (1.4.0) domain_name (0.5.20190701) @@ -590,7 +600,7 @@ GEM faraday (>= 0.15) fast_blank (1.0.1) fast_gettext (2.3.0) - ffaker (2.10.0) + ffaker (2.23.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -651,7 +661,7 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) - gapic-common (0.18.0) + gapic-common (0.20.0) faraday (>= 1.9, < 3.a) faraday-retry (>= 1.0, < 3.a) google-protobuf (~> 3.14) @@ -673,14 +683,14 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.7.0.pre.rc1) + gitaly (16.10.0.pre.rc1) 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.6.0) + gitlab-dangerfiles (4.7.0) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake (~> 13.0) @@ -693,9 +703,9 @@ GEM fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types - gitlab-glfm-markdown (0.0.11) + gitlab-glfm-markdown (0.0.13) rb_sys (~> 0.9.86) - gitlab-labkit (0.35.0) + gitlab-labkit (0.35.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -703,7 +713,7 @@ GEM opentracing (~> 0.4) pg_query (>= 4.2.3, < 6.0) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.3.0) + gitlab-license (2.4.0) gitlab-mail_room (0.0.24) jwt (>= 2.0) net-imap (>= 0.2.1) @@ -712,7 +722,7 @@ GEM redis-namespace (>= 1.8.2) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) - gitlab-sdk (0.2.3) + gitlab-sdk (0.3.0) activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) @@ -729,14 +739,15 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.11.0) - activesupport (>= 6.1, < 7.2) + gitlab_quality-test_tooling (1.17.0) + activesupport (>= 6.1, < 7.1) amatch (~> 0.4.1) gitlab (~> 4.19) http (~> 5.0) nokogiri (~> 1.10) parallel (>= 1, < 2) rainbow (>= 3, < 4) + rspec-parameterized (~> 1.0.0) table_print (= 1.5.7) zeitwerk (>= 2, < 3) globalid (1.1.0) @@ -783,12 +794,27 @@ GEM google-apis-core (>= 0.9.1, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) + google-cloud-artifact_registry-v1 (0.11.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-location (>= 0.4, < 2.a) + grpc-google-iam-v1 (~> 1.1) + google-cloud-common (1.1.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.2) + google-cloud-compute-v1 (2.6.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-common (~> 1.0) + google-cloud-errors (~> 1.0) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.0) + google-cloud-location (0.6.0) + gapic-common (>= 0.20.0, < 2.a) + google-cloud-errors (~> 1.0) google-cloud-profiler-v2 (0.4.0) gapic-common (>= 0.18.0, < 2.a) google-cloud-errors (~> 1.0) @@ -800,17 +826,16 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.25.2) + google-protobuf (3.25.3) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) grpc (~> 1.27) googleapis-common-protos-types (1.5.0) google-protobuf (~> 3.14) - googleauth (1.3.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -823,7 +848,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.0) + grape-entity (0.10.2) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (2.0.1) @@ -843,13 +868,14 @@ GEM graphiql-rails (1.8.0) railties sprockets-rails - graphlient (0.5.0) + graphlient (0.6.0) faraday (>= 1.0) faraday_middleware graphql-client graphlyte (1.0.0) - graphql (2.0.27) - graphql-client (0.18.0) + graphql (2.2.5) + racc (~> 1.4) + graphql-client (0.19.0) activesupport (>= 3.0) graphql graphql-docs (4.0.0) @@ -860,9 +886,13 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.58.0) - google-protobuf (~> 3.23) + grpc (1.60.0) + google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) + grpc-google-iam-v1 (1.5.0) + google-protobuf (~> 3.18) + googleapis-common-protos (~> 1.4) + grpc (~> 1.41) gssapi (1.3.1) ffi (>= 1.0.1) guard (2.16.2) @@ -936,8 +966,8 @@ GEM jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.4) - jira-ruby (2.1.4) + jaro_winkler (1.5.6) + jira-ruby (2.3.0) activesupport atlassian-jwt multipart-post @@ -977,9 +1007,9 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.3.0) + kas-grpc (0.4.0) grpc (~> 1.0) - knapsack (1.21.1) + knapsack (1.22.0) rake kramdown (2.3.2) rexml @@ -993,7 +1023,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.5.5) + lefthook (1.5.6) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1009,9 +1039,9 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - licensee (9.16.0) + licensee (9.16.1) dotenv (~> 2.0) - octokit (>= 4.20, < 7.0) + octokit (>= 4.20, < 9.0) reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) @@ -1055,7 +1085,6 @@ GEM actionpack (>= 5.2) activerecord (>= 5.2) matrix (0.4.2) - memoist (0.16.2) memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.5.1) @@ -1124,7 +1153,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (6.1.1) + octokit (8.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (18.1.3) @@ -1239,8 +1268,8 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.5.4) - pg_query (4.2.3) + pg (1.5.6) + pg_query (5.1.0) google-protobuf (>= 3.22.3) plist (3.7.0) png_quantizator (0.2.1) @@ -1254,12 +1283,12 @@ GEM prime (0.1.2) forwardable singleton - prism (0.19.0) + prism (0.24.0) proc_to_ast (0.1.0) coderay parser unparser - prometheus-client-mmap (1.1.0) + prometheus-client-mmap (1.1.1) rb_sys (~> 0.9.86) protocol (2.0.0) ruby_parser (~> 3.0) @@ -1281,7 +1310,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.8) + rack (2.2.8.1) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) @@ -1303,20 +1332,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails (7.0.8.1) + actioncable (= 7.0.8.1) + actionmailbox (= 7.0.8.1) + actionmailer (= 7.0.8.1) + actionpack (= 7.0.8.1) + actiontext (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activemodel (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.0.8.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1330,9 +1359,9 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -1343,25 +1372,30 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.86) - rbtrace (0.4.14) + rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rbtree (0.4.6) rchardet (1.8.0) - re2 (2.6.0) + re2 (2.7.0) mini_portile2 (~> 2.8.5) recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (4.8.0) + redis (5.0.8) + redis-client (>= 0.17.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.19.0) + redis-client (0.21.1) connection_pool + redis-cluster-client (0.7.5) + redis-client (~> 0.12) + redis-clustering (5.0.8) + redis (= 5.0.8) + redis-cluster-client (>= 0.7.0) redis-namespace (1.10.0) redis (>= 4) redis-rack (3.0.0) @@ -1424,7 +1458,7 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-rails (6.1.0) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -1437,11 +1471,10 @@ GEM rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.6) + rspec_profiling (0.0.8) activerecord - pg + get_process_mem rails - sqlite3 rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -1475,18 +1508,18 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.13.2) + ruby-lsp (0.14.4) language_server-protocol (~> 3.17.0) - prism (>= 0.19.0, < 0.20) - sorbet-runtime (>= 0.5.5685) - ruby-lsp-rails (0.2.8) + prism (>= 0.22.0, < 0.25) + sorbet-runtime (>= 0.5.10782) + ruby-lsp-rails (0.3.1) actionpack (>= 6.0) activerecord (>= 6.0) railties (>= 6.0) - ruby-lsp (>= 0.13.0, < 0.14.0) + ruby-lsp (>= 0.14.2, < 0.15.0) sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.8) - ruby-lsp (~> 0.13.0) + ruby-lsp-rspec (0.1.10) + ruby-lsp (~> 0.14.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1497,7 +1530,8 @@ GEM rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.3) + ruby_parser (3.21.0) + racc (~> 1.5) sexp_processor (~> 4.16) rubyntlm (0.6.3) rubypants (0.2.0) @@ -1509,14 +1543,6 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.0) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -1524,11 +1550,12 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.16.0) + selenium-webdriver (4.18.1) + base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (1.5.0) + semver_dialects (2.0.0) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) @@ -1543,22 +1570,16 @@ GEM sentry-sidekiq (5.10.0) sentry-ruby (~> 5.10.0) sidekiq (>= 3.0) - set (1.0.2) - sexp_processor (4.17.0) + sexp_processor (4.17.1) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (7.1.6) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) sidekiq (>= 6) sigdump (0.2.4) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -1596,10 +1617,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11144) - sorted_set (1.0.3) - rbtree - set (~> 1.0) + sorbet-runtime (0.5.11266) spamcheck (1.3.0) grpc (~> 1.0) spring (4.1.0) @@ -1613,8 +1631,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.0) - mini_portile2 (~> 2.8.0) ssh_data (1.3.0) ssrf_filter (1.0.8) stackprof (0.2.25) @@ -1655,7 +1671,7 @@ GEM test_file_finder (0.2.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) - thor (1.3.0) + thor (1.3.1) thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) @@ -1736,7 +1752,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.8.0) + view_component (3.11.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1767,7 +1783,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.19.1) + webmock (3.22.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1810,14 +1826,13 @@ DEPENDENCIES asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.8.0) asciidoctor-plantuml (~> 0.0.16) - atlassian-jwt (~> 0.2.0) + atlassian-jwt (~> 0.2.1) attr_encrypted (~> 3.2.4)! - autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.190.2) - aws-sdk-s3 (~> 1.142.0) - axe-core-rspec (~> 4.8.0) + aws-sdk-core (~> 3.191.3) + aws-sdk-s3 (~> 1.144.0) + axe-core-rspec (~> 4.8.2) babosa (~> 2.0) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1825,12 +1840,12 @@ DEPENDENCIES benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) better_errors (~> 2.10.1) - bootsnap (~> 1.17.1) + bootsnap (~> 1.18.3) browser (~> 5.3.1) bullet (~> 7.1.2) bundler-audit (~> 0.9.1) bundler-checksum (~> 0.1.0)! - capybara (~> 3.39, >= 3.39.2) + capybara (~> 3.40) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) @@ -1843,21 +1858,22 @@ DEPENDENCIES countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + cssbundling-rails (= 1.4.0) csv_builder! cvss-suite (~> 3.0.1) database_cleaner-active_record (~> 2.1.0) - deckar01-task_list (= 2.3.3) + deckar01-task_list (= 2.3.4) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.24.pre.alpha1) + devfile (~> 0.0.25.pre.alpha1) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! devise-two-factor (~> 4.1.1) diff_match_patch (~> 0.1.0)! diffy (~> 3.4) - discordrb-webhooks (~> 3.4) + discordrb-webhooks (~> 3.5) doorkeeper (~> 5.6, >= 5.6.6) doorkeeper-openid_connect (~> 1.8, >= 1.8.7) duo_api (~> 1.3) @@ -1872,7 +1888,7 @@ DEPENDENCIES faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank (~> 1.0.1) - ffaker (~> 2.10) + ffaker (~> 2.23) flipper (~> 0.26.2) flipper-active_record (~> 0.26.2) flipper-active_support_cache_store (~> 0.26.2) @@ -1883,19 +1899,19 @@ DEPENDENCIES fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) - gettext (~> 3.3) + gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.11.0) - gitaly (~> 16.7.0.pre.rc1) + gitaly (~> 16.10.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.6.0) + gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.8.0) - gitlab-glfm-markdown (~> 0.0.11) + gitlab-glfm-markdown (~> 0.0.13) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.35.0) - gitlab-license (~> 2.3) + gitlab-labkit (~> 0.35.1) + gitlab-license (~> 2.4) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -1903,14 +1919,14 @@ DEPENDENCIES gitlab-rspec_flaky! gitlab-safe_request_store! gitlab-schema-validation! - gitlab-sdk + gitlab-sdk (~> 0.3.0) gitlab-secret_detection! gitlab-sidekiq-fetcher! gitlab-styles (~> 11.0.0) gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.11.0) + gitlab_quality-test_tooling (~> 1.17.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1923,21 +1939,24 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-apis-storage_v1 (~> 0.29) + google-cloud-artifact_registry-v1 (~> 0.11.0) + google-cloud-compute-v1 (~> 2.6.0) google-cloud-storage (~> 1.45.0) - google-protobuf (~> 3.25, >= 3.25.2) + google-protobuf (~> 3.25, >= 3.25.3) + googleauth (~> 1.8.1) gpgme (~> 2.0.23) grape (~> 2.0.0) - grape-entity (~> 0.10.0) - grape-path-helpers (~> 2.0.0) + grape-entity (~> 0.10.2) + grape-path-helpers (~> 2.0.1) grape-swagger (~> 2.0.1) grape-swagger-entity (~> 0.5.1) - grape_logging (~> 1.8) + grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) - graphlient (~> 0.5.0) + graphlient (~> 0.6.0) graphlyte (~> 1.0.0) - graphql (~> 2.0.27) + graphql (~> 2.2.5) graphql-docs (~> 4.0.0) - grpc (~> 1.58.0) + grpc (~> 1.60.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.53) @@ -1953,18 +1972,18 @@ DEPENDENCIES ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! - jira-ruby (~> 2.1.4) + jira-ruby (~> 2.3.0) js_regex (~> 3.8) json (~> 2.6.3) json_schemer (~> 0.2.18) jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.3.0) - knapsack (~> 1.21.1) + kas-grpc (~> 0.4.0) + knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.5.5) + lefthook (~> 1.5.6) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.16) @@ -1989,7 +2008,7 @@ DEPENDENCIES net-protocol (~> 0.1.3) nokogiri (~> 1.16) oauth2 (~> 2.0) - octokit (~> 6.0) + octokit (~> 8.0) ohai (~> 18.1) oj (~> 3.13.21) oj-introspect (~> 0.7) @@ -2014,36 +2033,37 @@ DEPENDENCIES openid_connect (= 1.3.0) openssl (~> 3.0) org-ruby (~> 0.9.12) - os (~> 1.1) + os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) parser (~> 3.3, >= 3.3.0.2) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.5.4) - pg_query (~> 4.2.3) + pg (~> 1.5.6) + pg_query (~> 5.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 1.1) + 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) + rack (~> 2.2.8.1) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.8) + rails (~> 7.0.8.1) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) - re2 (= 2.6.0) + re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 4.8.0) + redis (~> 5.0.0) redis-actionpack (~> 5.4.0) + redis-clustering (~> 5.0.0) redis-namespace (~> 1.10.0) request_store (~> 1.5.1) responders (~> 3.0) @@ -2053,15 +2073,15 @@ DEPENDENCIES rqrcode (~> 2.0) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) - rspec-rails (~> 6.1.0) + rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter - rspec_profiling (~> 0.0.6) + rspec_profiling (~> 0.0.8) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.13.2) - ruby-lsp-rails (~> 0.2.8) - ruby-lsp-rspec (~> 0.1.8) + ruby-lsp (~> 0.14.4) + ruby-lsp-rails (~> 0.3.0) + ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) @@ -2069,17 +2089,16 @@ DEPENDENCIES rubyzip (~> 2.3.2) rugged (~> 1.6) sanitize (~> 6.0.2) - sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.16) - semver_dialects (~> 1.5) + selenium-webdriver (~> 4.18, >= 4.18.1) + semver_dialects (~> 2.0) sentry-rails (~> 5.10.0) sentry-raven (~> 3.1) sentry-ruby (~> 5.10.0) sentry-sidekiq (~> 5.10.0) shoulda-matchers (~> 5.1.0) - sidekiq (~> 7.1.6) + sidekiq! sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) @@ -2113,16 +2132,16 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.8.0) + view_component (~> 3.11.0) vite_rails (~> 3.0.17) vite_ruby (~> 3.5.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.19.1) + webmock (~> 3.22.0) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.4 + 2.5.6 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 4086a43e089d9..2520955593dee 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; + sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; + sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; + sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; + sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; + sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; + sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,32 +83,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; + sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; + sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; - groups = ["default" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; + sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; + sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -343,17 +343,6 @@ src: }; version = "1.0.1"; }; - autoprefixer-rails = { - dependencies = ["execjs"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vlqwy2qkp39ibp7llj7ps53nvxav29c2yl451v1qdhj25zxc49p"; - type = "gem"; - }; - version = "10.2.5.1"; - }; awesome_print = { groups = ["development" "test"]; platforms = []; @@ -411,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z9f8ypvpwj3sfqh3nlnhrq7ryhrv7isqzg370fba27zpy7bv5sx"; + sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; type = "gem"; }; - version = "3.190.2"; + version = "3.191.3"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr"; + sha256 = "0ypg31pfzbd43n1m20cyf6gyrlv6m0c8hmk2p5hidy1y4pi34f6g"; type = "gem"; }; - version = "1.142.0"; + version = "1.144.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -466,10 +455,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj"; + sha256 = "14h4abf5h242a0vn2r05pkr8311qbxgkl63py7vbhx8bfpk1kq3i"; type = "gem"; }; - version = "4.8.0"; + version = "4.8.2"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -534,6 +523,16 @@ src: }; version = "0.3.2"; }; + base64 = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; batch-loader = { groups = ["default"]; platforms = []; @@ -653,10 +652,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "028qif22isxa5sg5gf1322d0qjhir5rr0jpkaiwcic4lspacdcnv"; + sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp"; type = "gem"; }; - version = "1.17.1"; + version = "1.18.3"; }; browser = { groups = ["default"]; @@ -730,10 +729,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; + sha256 = "1vxfah83j6zpw3v5hic0j70h519nvmix2hbszmjwm8cfawhagns2"; type = "gem"; }; - version = "3.39.2"; + version = "3.40.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -762,10 +761,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; type = "gem"; }; - version = "0.5.9.6"; + version = "0.5.9.8"; }; CFPropertyList = { dependencies = ["rexml"]; @@ -779,15 +778,14 @@ src: version = "3.0.5"; }; character_set = { - dependencies = ["sorted_set"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ql0kxnpbblggyn8hx511pghpqf8xv3ng2kbybwwdi11bg1il6zp"; + sha256 = "0l9z2pihzc11f0jpq2sx789zwpmwf5nyhsjps45zzvfs5931fwrb"; type = "gem"; }; - version = "1.4.1"; + version = "1.8.0"; }; charlock_holmes = { groups = ["default"]; @@ -1043,6 +1041,17 @@ src: }; version = "1.14.0"; }; + cssbundling-rails = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nzp4j1ll6llgbrvqk81gkz6fqgk33sx4k1fcvbm7v7h79jk8808"; + type = "gem"; + }; + version = "1.4.0"; + }; csv_builder = { groups = ["default"]; platforms = []; @@ -1068,10 +1077,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x8xwn2l7avc6h08vgrkxyb6ga7slip5x8lynswmzd0y32ngnw4h"; + sha256 = "104x4p9rmk8frf4l858p171vjaif7mqgxspx61d26c0hfg355ra3"; type = "gem"; }; - version = "9.3.1"; + version = "9.4.2"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1161,10 +1170,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li"; + sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; declarative = { groups = ["default"]; @@ -1224,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0036nfmz7dz5jwagm4k3hshrkmm3w2473q38bhnr06dmxlkgrfvj"; + sha256 = "1p11hv0a2s4m29vvyr7z22wjr9f4cfmdjnqidrv62rfcg9r73w0g"; type = "gem"; }; - version = "0.0.24.pre.alpha1"; + version = "0.0.25.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1317,10 +1326,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg"; + sha256 = "1c933kq48sqja1a2fc4ki9w8x5ajl6lp67hslka5k05hwfyaiysj"; type = "gem"; }; - version = "3.4.2"; + version = "3.5.0"; }; docile = { groups = ["coverage" "default" "development" "test"]; @@ -1856,14 +1865,14 @@ src: version = "2.3.0"; }; ffaker = { - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3"; + sha256 = "1644hpjg7k08dsjhljwg4grs49riaw6bxp5xf62jrac4q9fgnbcx"; type = "gem"; }; - version = "2.10.0"; + version = "2.23.0"; }; ffi = { groups = ["default" "development" "kerberos" "puma" "test"]; @@ -2075,10 +2084,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1awn2k5b2sji74vr0xhg0v68h1y0msqpkwq5z8k31mp2ii9mmmbg"; + sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g"; type = "gem"; }; - version = "0.18.0"; + version = "0.20.0"; }; gemoji = { groups = ["default" "development" "test"]; @@ -2140,10 +2149,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqi0f0pf7cj110b981nx95wql3i4knzvc6417ym3yvbvsxjyand"; + sha256 = "1nwc8mlpznq9b7rgcbxwzaj936pn0syjasxdhplpiz3iqbr64ca8"; type = "gem"; }; - version = "16.7.0.pre.rc1"; + version = "16.10.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2183,10 +2192,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07kl43xcjfwdlcfvr7ifzggl6zpmm8q0lj8phlk3db8xgnqkf6s4"; + sha256 = "1jj5w7h457cm2q0ds63kp29ybkq1h02gibn37y2r0wnbimm8fxi5"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2216,13 +2225,13 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0h4bvfvlwyfx8ia03lr9dlpy38n75v2wxh424v6fhy4z08ycab"; + sha256 = "0nk9kp3zb2x1hpqirq7x2qqpmfsqq4izprbicxjb20bqvm4mvvdb"; type = "gem"; }; - version = "0.0.11"; + version = "0.0.13"; }; gitlab-housekeeper = { - dependencies = ["activesupport" "httparty" "rubocop"]; + dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; groups = ["development" "test"]; platforms = []; source = { @@ -2247,20 +2256,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ya6r3ij0fzz6p50h157bn224n7405nwak6lx80ppvil9sm0dzr6"; + sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79"; type = "gem"; }; - version = "0.35.0"; + version = "0.35.1"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ms1kf5nmclsnmd2xa9k273asmb73ivaykwrb3g7sq263j3y7jk0"; + sha256 = "082ycgvq7j0kyqrbx8shipqk3lgz6i279caf1ljvk9h5wsqqy8zx"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; @@ -2339,10 +2348,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnhl888n4zfwhmfy3f1pj0k1rzjwpf16a1ic7wb22l64252g4g8"; + sha256 = "00w9p1h3awari07vh33h65y1l1jh7sgym8fzgcp5q5aihha0y9i2"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.0"; }; gitlab-secret_detection = { dependencies = ["parallel" "re2" "toml-rb"]; @@ -2408,15 +2417,15 @@ src: version = "2.2.0"; }; gitlab_quality-test_tooling = { - dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "table_print" "zeitwerk"]; + dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0anhwfn9dnd8zkjwkq3qycjswfxqksfnwvl7dr6azz2zvjnxnii1"; + sha256 = "1d59k5c0y8vkmz7fjh7x455d4d19fpw4r9agv02vqyvp7glrbm34"; type = "gem"; }; - version = "1.11.0"; + version = "1.17.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2605,6 +2614,39 @@ src: }; version = "0.29.0"; }; + google-cloud-artifact_registry-v1 = { + dependencies = ["gapic-common" "google-cloud-errors" "google-cloud-location" "grpc-google-iam-v1"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gkq82lsjz3yw9w819ifdqx9ixcbgydr5myy64wnczknx7fd505s"; + type = "gem"; + }; + version = "0.11.0"; + }; + google-cloud-common = { + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk"; + type = "gem"; + }; + version = "1.1.0"; + }; + google-cloud-compute-v1 = { + dependencies = ["gapic-common" "google-cloud-common" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07hly5qbdy0qddw48biw0ybi2cx13861l5i09mj2abzw7yrmjq5r"; + type = "gem"; + }; + version = "2.6.0"; + }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; groups = ["default"]; @@ -2637,6 +2679,17 @@ src: }; version = "1.3.0"; }; + google-cloud-location = { + dependencies = ["gapic-common" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l6j0i8flfdzl9c7db990632jmn5v7bmbh1i6x0sqp3f2p59jv1q"; + type = "gem"; + }; + version = "0.6.0"; + }; google-cloud-profiler-v2 = { dependencies = ["gapic-common" "google-cloud-errors"]; groups = ["default"]; @@ -2664,10 +2717,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw"; + sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; type = "gem"; }; - version = "3.25.2"; + version = "3.25.3"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2692,15 +2745,15 @@ src: version = "1.5.0"; }; googleauth = { - dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + dependencies = ["faraday" "jwt" "multi_json" "os" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai"; + sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1"; type = "gem"; }; - version = "1.3.0"; + version = "1.8.1"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2726,14 +2779,14 @@ src: }; grape-entity = { dependencies = ["activesupport" "multi_json"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zic5fx8s0424vdarhslmxdqmfnlfv3k4prfyxrrwvf9pdy1xvcs"; + sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.2"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -2796,10 +2849,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjw0hd9rmfc687yj1cfd8jjy8gh7k6zn6w9syvcl1f2hb98b0g"; + sha256 = "1h652p91zdbdigb155vhdlh0lnq4ia8wlg5y5h0ibhlf9i5ndn5q"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; graphlyte = { groups = ["test"]; @@ -2812,14 +2865,15 @@ src: version = "1.0.0"; }; graphql = { + dependencies = ["racc"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dlb8hbgs7yas59pwf4k7qrczbgkvrpcjqd2f5cmjj02fxdbwn8z"; + sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm"; type = "gem"; }; - version = "2.0.27"; + version = "2.2.5"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2827,10 +2881,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq"; + sha256 = "1iv9d6l14h05vnhrzmm5fn2cnjb469an28c9z7c6p4bgjy0rssgy"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; graphql-docs = { dependencies = ["commonmarker" "dartsass" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline"]; @@ -2849,10 +2903,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00lx7sql179ak7rx5vg76z45y558d5wj0gldql4qjcaxjnzcryqc"; + sha256 = "1bzkhy5yy4a8nlp89wwfw9bv4h358gsa9rvzn6i2y0z2ha5vmgqn"; + type = "gem"; + }; + version = "1.60.0"; + }; + grpc-google-iam-v1 = { + dependencies = ["google-protobuf" "googleapis-common-protos" "grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf"; type = "gem"; }; - version = "1.58.0"; + version = "1.5.0"; }; gssapi = { dependencies = ["ffi"]; @@ -3217,10 +3282,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; + sha256 = "10fd3i92897blalxfkgc0jjv0qqx31v7cm7j2b6a3b97an0bfz80"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; jira-ruby = { dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; @@ -3228,10 +3293,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2"; + sha256 = "0qpbc97sag426h4hgcizqq2njxx5fridzxq6mq5s93jazxmnxwmb"; type = "gem"; }; - version = "2.1.4"; + version = "2.3.0"; }; jmespath = { groups = ["default"]; @@ -3367,10 +3432,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12md9pbh0m2yfx0vy81dyn40ibdnhzm6b7kfwra66pkjwrac9pvq"; + sha256 = "13bkqrdz1rdn23nn0zni7vdvwnm34apgi3xy42djhhxl698888dv"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; knapsack = { dependencies = ["rake"]; @@ -3378,10 +3443,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056g86ndhq51303k4g3fhdfwhpr6cpzypxhlnp0wxjpbmli09xw2"; + sha256 = "1jqs9shqg3nd6j3kzbh8gxv7ix1n877y64kdjzbrwjgz6ksqs9mx"; type = "gem"; }; - version = "1.21.1"; + version = "1.22.0"; }; kramdown = { dependencies = ["rexml"]; @@ -3442,10 +3507,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ac5r000h6rp7gdwyxr1n8hsg5b88gwbdkq87pbcjzps9li6n6nz"; + sha256 = "1rc7fzg4rjchyv7rd6vlz35hg5n8k5625s78hj12zji0xhg1jznc"; type = "gem"; }; - version = "1.5.5"; + version = "1.5.6"; }; letter_opener = { dependencies = ["launchy"]; @@ -3496,10 +3561,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv"; + sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04"; type = "gem"; }; - version = "9.16.0"; + version = "9.16.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -3648,16 +3713,6 @@ src: }; version = "0.4.2"; }; - memoist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; - }; memory_profiler = { groups = ["default" "development" "test"]; platforms = []; @@ -4115,10 +4170,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gxh0x910qvah2sm9fbxn8jjy3pgwskyd3gm703zf182hafll3lj"; + sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3"; type = "gem"; }; - version = "6.1.1"; + version = "8.0.0"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4548,14 +4603,14 @@ src: version = "1.1.0"; }; pg = { - groups = ["default" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; + sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4563,10 +4618,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; + sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp"; type = "gem"; }; - version = "4.2.3"; + version = "5.1.0"; }; plist = { groups = ["default"]; @@ -4626,10 +4681,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; + sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji"; type = "gem"; }; - version = "0.19.0"; + version = "0.24.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4648,10 +4703,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19mi424kwalrzdm7cvzjx2w0rw778mxqb75y9wn20nc277nxglvb"; + sha256 = "0vg47xx3wgg24snqc6ychb08mbcyrjmvxym9fg69cpa4xvj133fx"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; protocol = { dependencies = ["ruby_parser"]; @@ -4764,10 +4819,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.8.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4873,10 +4928,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; + sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4928,10 +4983,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; + sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4990,20 +5045,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn"; - type = "gem"; - }; - version = "0.4.14"; - }; - rbtree = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z0h1x7fpkzxamnvbw1nry64qd6n0nqkwprfair29z94kd3a9vhl"; + sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; type = "gem"; }; - version = "0.4.6"; + version = "0.5.1"; }; rchardet = { groups = ["default" "development"]; @@ -5021,10 +5066,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sj80r3gy4sb27mrgc6pwcf2lra669p8p81axdv2p5pfm6k3mqbq"; + sha256 = "1p0kxb1gwrsv2r38jwgsg8b5k2xx966qmrc6aajfncpzm398i79i"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; recaptcha = { dependencies = ["json"]; @@ -5068,14 +5113,15 @@ src: version = "4.3.3"; }; redis = { + dependencies = ["redis-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; + sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv"; type = "gem"; }; - version = "4.8.0"; + version = "5.0.8"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5094,10 +5140,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9jaqsdc2s2qm713pdv19dawk1b11vxnfclsps7ra2szwisznbf"; + sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; type = "gem"; }; - version = "0.19.0"; + version = "0.21.1"; + }; + redis-cluster-client = { + dependencies = ["redis-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j"; + type = "gem"; + }; + version = "0.7.5"; + }; + redis-clustering = { + dependencies = ["redis" "redis-cluster-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf"; + type = "gem"; + }; + version = "5.0.8"; }; redis-namespace = { dependencies = ["redis"]; @@ -5372,10 +5440,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpmbq2awsjiwn300cafp9fbvv86dl7zrb760anhmm1qw8yzg1my"; + sha256 = "1clmx6qzdbpm1g8ycg38gjbqsbr8ccqi6hqyx88g8yckz1hrx55x"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -5410,15 +5478,15 @@ src: version = "0.6.0"; }; rspec_profiling = { - dependencies = ["activerecord" "pg" "rails" "sqlite3"]; + dependencies = ["activerecord" "get_process_mem" "rails"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs"; + sha256 = "0icl94f0mmw7g4h1qnsil0cw6zw7b5wv0ilxda01928vh5bf87mk"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.8"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -5525,10 +5593,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; + sha256 = "1v0dwirw4mq7qkf5a7wvagil4ppvk4dw4ln8hs6rmf2xrf56ga5f"; type = "gem"; }; - version = "0.13.2"; + version = "0.14.4"; }; ruby-lsp-rails = { dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; @@ -5536,10 +5604,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j2pb9d9frdh6rpz5qcvhmqswqdmmxa392z2nv1rnk60cpxclc0p"; + sha256 = "033kxj55pywnc4cjqcfb2jvn96nsa93m93qd2p636jf5hkqazq41"; type = "gem"; }; - version = "0.2.8"; + version = "0.3.1"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5547,10 +5615,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18qfm86bafybm93kz1bn2z86gwaax3c57i25g4lzgv6pp9aj5nr1"; + sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.10"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5616,15 +5684,15 @@ src: version = "0.0.5"; }; ruby_parser = { - dependencies = ["sexp_processor"]; + dependencies = ["racc" "sexp_processor"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8w4mqhqaw53jd27cfhq1mq02d1r606x9fmrpfzz0fwjnk8j8ld"; + sha256 = "0sy5y7w89ii5iqym7b21glcwxqg8kizxfy8a7kcxq0j65wyqjhiq"; type = "gem"; }; - version = "3.20.3"; + version = "3.21.0"; }; rubyntlm = { groups = ["default"]; @@ -5698,28 +5766,6 @@ src: }; version = "6.0.2"; }; - sassc = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; - type = "gem"; - }; - version = "2.4.0"; - }; - sassc-rails = { - dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn"; - type = "gem"; - }; - version = "2.1.0"; - }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["danger" "default" "development" "test"]; @@ -5753,15 +5799,15 @@ src: version = "2.3.7"; }; selenium-webdriver = { - dependencies = ["rexml" "rubyzip" "websocket"]; + dependencies = ["base64" "rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qy3whgdg6q5bi6mzbq5gc94rxnkasdhdx3c73z3a955krj16w13"; + sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b"; type = "gem"; }; - version = "4.16.0"; + version = "4.18.1"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5769,10 +5815,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bj9r98ilpgg0w0h80wydfssr7kv65y0v2afsf1azhf9mymz3000"; + sha256 = "11s5nr5v81qjlf2glgqjisvnv12vmwsmi9abbzqkb1nqjhw43691"; type = "gem"; }; - version = "1.5.0"; + version = "2.0.0"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -5818,25 +5864,15 @@ src: }; version = "5.10.0"; }; - set = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00ick64s6066idlylbxhpjmxf56h1l22c8xp0mg4j8963zga9zq2"; - type = "gem"; - }; - version = "1.0.2"; - }; sexp_processor = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzz9mhg4kkdqf179pm30i204h7iskanxrk53j0csf0qrrs4iajd"; + sha256 = "182x05kpdjlckh31qizws50fz7sjk86yjjfmy45z61q3f930j4ci"; type = "gem"; }; - version = "4.17.0"; + version = "4.17.1"; }; shellany = { groups = ["default" "test"]; @@ -5864,9 +5900,8 @@ src: groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq"; - type = "gem"; + path = "${src}/vendor/gems/sidekiq-7.1.6"; + type = "path"; }; version = "7.1.6"; }; @@ -5897,10 +5932,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; + sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; simple_po_parser = { groups = ["development" "test"]; @@ -6031,21 +6066,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb"; - type = "gem"; - }; - version = "0.5.11144"; - }; - sorted_set = { - dependencies = ["rbtree" "set"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0brpwv68d7m9qbf5js4bg8bmg4v7h4ghz312jv9cnnccdvp8nasg"; + sha256 = "1fsq1k58isarg6ycg2ix9sw9a6391y12ss48m3hcryqi902w7cny"; type = "gem"; }; - version = "1.0.3"; + version = "0.5.11266"; }; spamcheck = { dependencies = ["grpc"]; @@ -6111,17 +6135,6 @@ src: }; version = "3.4.2"; }; - sqlite3 = { - dependencies = ["mini_portile2"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x"; - type = "gem"; - }; - version = "1.6.0"; - }; ssh_data = { groups = ["default"]; platforms = []; @@ -6364,14 +6377,14 @@ src: version = "1.3.1"; }; thor = { - groups = ["default" "development" "monorepo" "omnibus" "test"]; + groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; thread_safe = { groups = ["default" "test"]; @@ -6778,10 +6791,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xn5q1mbhwalx16mj441pzbm8hkxdmwxwzdjcj86f3bfnpipzh9y"; + sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539"; type = "gem"; }; - version = "3.8.0"; + version = "3.11.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6875,10 +6888,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; + sha256 = "13jb9q0qv9ajw1ajr4cawnqj4h0dws3w5j4v5n6v3xk7a8rnjzr7"; type = "gem"; }; - version = "3.19.1"; + version = "3.22.0"; }; webrick = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index ecadfb5d13cd5..40c744e1aed44 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -18,16 +18,16 @@ let gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-CHlLValZnO5Jd7boMWnK9bYCSjjM4Dj6xvn6tBlvP8c="; + hash = "sha256-Sl7nNYoiCdTZ50tIfJcq5x9KOBkgJsb5bq09chWbyQc="; }; - cargoHash = "sha256-7nc6eIuY08nTeHMVwKukOdd0zP6xbUPo7NcZ8EEGUNI="; + cargoHash = "sha256-G1NWRkhcmFrcHaIxQ7nzvRejPZUuZQDiNonZykkt4qM="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index 2d0878cf0d95e..dffb905a6fd53 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.8.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-+oJBpERU2WbfmS7MyBbJKrh4kzY+rgSw4uKAU1y5kR4="; + hash = "sha256-WaiGkbjqty/MsTWPvx5DmmaNwWTJAEFKwVqArt2oZZc="; }; - vendorHash = "sha256-Z46eDqUc8Mdq9lEMx1YOuSh5zPIMQrSkbto33AmgANU="; + vendorHash = "sha256-p2E010k7uozpLvl9VpfG5/JyQR4mVUBKv2p78UdFlac="; subPackages = [ "." diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix index ccb1f07edeca4..2e2fc5af2c4c3 100644 --- a/pkgs/applications/version-management/gitstatus/default.nix +++ b/pkgs/applications/version-management/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk="; + sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix deleted file mode 100644 index d626585b97c5c..0000000000000 --- a/pkgs/applications/version-management/gitui/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, libiconv -, openssl -, pkg-config -, xclip -, AppKit -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gitui"; - version = "0.25.1"; - - src = fetchFromGitHub { - owner = "extrawurst"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+u0XvZb42RRlQnQUZHrMXRJU+31CDy/oLYQ55tLlmUg="; - }; - - cargoHash = "sha256-3FBrJvLSuDehCy+o7valkf5LSuMkD2loD2JPQO4+3sY="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isLinux xclip - ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; - - # The cargo config overrides linkers for some targets, breaking the build - # on e.g. `aarch64-linux`. These overrides are not required in the Nix - # environment: delete them. - postPatch = "rm .cargo/config"; - - - # Getting app_config_path fails with a permission denied - checkFlags = [ - "--skip=keys::key_config::tests::test_symbolic_links" - ]; - - - meta = with lib; { - description = "Blazing fast terminal-ui for Git written in Rust"; - homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; - mainProgram = "gitui"; - license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; - }; -} diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix index ddd56fdfb11c7..a6a81fb08782a 100644 --- a/pkgs/applications/version-management/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sMAHVXpgAhZYUpl75JRtKhTqt/sQkSkoEzk7aGV1vcQ="; + hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4="; }; - cargoSha256 = "sha256-CaWpGNP7Jsv/3dks0LVbZXoD/9HqJmOzaD0ejT5xSqA="; + cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE="; nativeCheckInputs = [ git diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index b6b4bd8e8e411..8b5580650b32c 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-yppQIffjpyQ2nqhiZbV2pSMQJx8srmHjAk+UClCQfRw="; + hash = "sha256-7bMyboF1JG/roFgo3cusYTi7qd2a6W+u1RJHgoBXNL0="; }; - cargoHash = "sha256-2BmKC8DaOdD/THchImmGqplhDrHQHEMyWORWnE2ygSM="; + cargoHash = "sha256-nPBHIUBm4bQLuj93kE8CUfzA34uUyapVjswz9FFCiTk="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index 4e8db1fef606f..dcaca33f09522 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DrgZBzcJmqSP7iCHZyy623iRZYfTE/z/zzx7I+BAOBo="; + sha256 = "sha256-jxcsTtQcSuL+2vwdxIVxqTpKh8Bfvna+hkGt+Rx21FE="; }; - cargoHash = "sha256-5P0CiLCf86Jul4EaIDqHGkp4XNifLKnWJZXtrLkpLMY="; + cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 563e7362d51d1..3b2f52f007741 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.22.1"; + version = "3.22.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bdO9MtvUNBq6djD7lTd393x3aB7qIjazZB1iKo+QaDY="; + sha256 = "sha256-RqCnE/vNGxU7N3oeB1fIziVcmCJGdljqz72JsekjFu8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 188c5bbe2206c..695e596e8c850 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -4,10 +4,7 @@ , lib , emptyDirectory , linkFarm -, symlinkJoin , jam -, libcxx -, libcxxabi , openssl , xcbuild , CoreServices @@ -33,10 +30,6 @@ let # cone-based Git sparse checkout, either.) { name = "contrib"; path = "${src}/contrib"; } ]; - libcxxUnified = symlinkJoin { - inherit (libcxx) name; - paths = [ libcxx libcxxabi ]; - }; in stdenv.mkDerivation rec { pname = "p4"; @@ -70,7 +63,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ "-sOSVER=1013" "-sMACOSX_SDK=${emptyDirectory}" - "-sLIBC++DIR=${libcxxUnified}/lib" + "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" ]; CCFLAGS = diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index d8be3e9023cc8..bb6e7aeb91147 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; src = fetchCrate { inherit version pname; - hash = "sha256-BQic+E+SOfZYHJcYMaUmfjlIfop0YcVcASSjtnRtwD4="; + hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; }; - cargoHash = "sha256-D5P9pizerJiZK4UhCKEY1DXvaBMiWBXGu6Azlv6AjQA="; + cargoHash = "sha256-iXGvb4qmZK7Sjbf/Jkyzj+nhpZFV3ngjtJfz6x/8z2s="; doCheck = false; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/applications/version-management/radicle-upstream/default.nix b/pkgs/applications/version-management/radicle-upstream/default.nix index 51365d0c4a31b..69c960ed78e86 100644 --- a/pkgs/applications/version-management/radicle-upstream/default.nix +++ b/pkgs/applications/version-management/radicle-upstream/default.nix @@ -15,7 +15,7 @@ let sha256 = "sha256-EuWGbn6qggi8/9Rci8iaXfuVKE+QXb1BHEYDvotR/q4="; }; }; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); contents = appimageTools.extract { inherit name src; }; @@ -77,6 +77,7 @@ let maintainers = with maintainers; [ d-xo ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + broken = stdenv.isLinux; # last successful build 2023-04-11 }; in if stdenv.isDarwin diff --git a/pkgs/applications/version-management/redmine/0001-python3.patch b/pkgs/applications/version-management/redmine/0001-python3.patch deleted file mode 100644 index c88645b85a281..0000000000000 --- a/pkgs/applications/version-management/redmine/0001-python3.patch +++ /dev/null @@ -1,275 +0,0 @@ ---- a/lib/redmine/scm/adapters/mercurial/redminehelper.py -+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py -@@ -45,17 +45,20 @@ Output example of rhmanifest:: - </repository> - </rhmanifest> - """ --import re, time, cgi, urllib -+import re, time, html, urllib - from mercurial import cmdutil, commands, node, error, hg, registrar - - cmdtable = {} - command = registrar.command(cmdtable) if hasattr(registrar, 'command') else cmdutil.command(cmdtable) - --_x = cgi.escape --_u = lambda s: cgi.escape(urllib.quote(s)) -+_x = lambda s: html.escape(s.decode('utf-8')).encode('utf-8') -+_u = lambda s: html.escape(urllib.parse.quote(s)).encode('utf-8') -+ -+def unquoteplus(*args, **kwargs): -+ return urllib.parse.unquote_to_bytes(*args, **kwargs).replace(b'+', b' ') - - def _changectx(repo, rev): -- if isinstance(rev, str): -+ if isinstance(rev, bytes): - rev = repo.lookup(rev) - if hasattr(repo, 'changectx'): - return repo.changectx(rev) -@@ -70,10 +73,10 @@ def _tip(ui, repo): - except TypeError: # Mercurial < 1.1 - return repo.changelog.count() - 1 - tipctx = _changectx(repo, tiprev()) -- ui.write('<tip revision="%d" node="%s"/>\n' -+ ui.write(b'<tip revision="%d" node="%s"/>\n' - % (tipctx.rev(), _x(node.hex(tipctx.node())))) - --_SPECIAL_TAGS = ('tip',) -+_SPECIAL_TAGS = (b'tip',) - - def _tags(ui, repo): - # see mercurial/commands.py:tags -@@ -84,7 +87,7 @@ def _tags(ui, repo): - r = repo.changelog.rev(n) - except error.LookupError: - continue -- ui.write('<tag revision="%d" node="%s" name="%s"/>\n' -+ ui.write(b'<tag revision="%d" node="%s" name="%s"/>\n' - % (r, _x(node.hex(n)), _u(t))) - - def _branches(ui, repo): -@@ -104,136 +107,148 @@ def _branches(ui, repo): - return repo.branchheads(branch) - def lookup(rev, n): - try: -- return repo.lookup(rev) -+ return repo.lookup(str(rev).encode('utf-8')) - except RuntimeError: - return n - for t, n, r in sorted(iterbranches(), key=lambda e: e[2], reverse=True): - if lookup(r, n) in branchheads(t): -- ui.write('<branch revision="%d" node="%s" name="%s"/>\n' -+ ui.write(b'<branch revision="%d" node="%s" name="%s"/>\n' - % (r, _x(node.hex(n)), _u(t))) - - def _manifest(ui, repo, path, rev): - ctx = _changectx(repo, rev) -- ui.write('<manifest revision="%d" path="%s">\n' -+ ui.write(b'<manifest revision="%d" path="%s">\n' - % (ctx.rev(), _u(path))) - - known = set() -- pathprefix = (path.rstrip('/') + '/').lstrip('/') -+ pathprefix = (path.decode('utf-8').rstrip('/') + '/').lstrip('/') - for f, n in sorted(ctx.manifest().iteritems(), key=lambda e: e[0]): -- if not f.startswith(pathprefix): -+ fstr = f.decode('utf-8') -+ if not fstr.startswith(pathprefix): - continue -- name = re.sub(r'/.*', '/', f[len(pathprefix):]) -+ name = re.sub(r'/.*', '/', fstr[len(pathprefix):]) - if name in known: - continue - known.add(name) - - if name.endswith('/'): -- ui.write('<dir name="%s"/>\n' -+ ui.write(b'<dir name="%s"/>\n' - % _x(urllib.quote(name[:-1]))) - else: - fctx = repo.filectx(f, fileid=n) - tm, tzoffset = fctx.date() -- ui.write('<file name="%s" revision="%d" node="%s" ' -- 'time="%d" size="%d"/>\n' -+ ui.write(b'<file name="%s" revision="%d" node="%s" ' -+ b'time="%d" size="%d"/>\n' - % (_u(name), fctx.rev(), _x(node.hex(fctx.node())), - tm, fctx.size(), )) - -- ui.write('</manifest>\n') -+ ui.write(b'</manifest>\n') - --@command('rhannotate', -- [('r', 'rev', '', 'revision'), -- ('u', 'user', None, 'list the author (long with -v)'), -- ('n', 'number', None, 'list the revision number (default)'), -- ('c', 'changeset', None, 'list the changeset'), -+@command(b'rhannotate', -+ [(b'r', b'rev', b'', b'revision'), -+ (b'u', b'user', None, b'list the author (long with -v)'), -+ (b'n', b'number', None, b'list the revision number (default)'), -+ (b'c', b'changeset', None, b'list the changeset'), - ], -- 'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') -+ b'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') - def rhannotate(ui, repo, *pats, **opts): -- rev = urllib.unquote_plus(opts.pop('rev', None)) -+ rev = unquoteplus(opts.pop('rev', b'')) - opts['rev'] = rev -- return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts) -+ return commands.annotate(ui, repo, *map(unquoteplus, pats), **opts) - --@command('rhcat', -- [('r', 'rev', '', 'revision')], -- 'hg rhcat ([-r REV] ...) FILE...') -+@command(b'rhcat', -+ [(b'r', b'rev', b'', b'revision')], -+ b'hg rhcat ([-r REV] ...) FILE...') - def rhcat(ui, repo, file1, *pats, **opts): -- rev = urllib.unquote_plus(opts.pop('rev', None)) -+ rev = unquoteplus(opts.pop('rev', b'')) - opts['rev'] = rev -- return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts) -+ return commands.cat(ui, repo, unquoteplus(file1), *map(unquoteplus, pats), **opts) - --@command('rhdiff', -- [('r', 'rev', [], 'revision'), -- ('c', 'change', '', 'change made by revision')], -- 'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') -+@command(b'rhdiff', -+ [(b'r', b'rev', [], b'revision'), -+ (b'c', b'change', b'', b'change made by revision')], -+ b'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') - def rhdiff(ui, repo, *pats, **opts): - """diff repository (or selected files)""" - change = opts.pop('change', None) - if change: # add -c option for Mercurial<1.1 - base = _changectx(repo, change).parents()[0].rev() -- opts['rev'] = [str(base), change] -+ opts['rev'] = [base, change] - opts['nodates'] = True -- return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts) -- --@command('rhlog', -- [ -- ('r', 'rev', [], 'show the specified revision'), -- ('b', 'branch', [], -- 'show changesets within the given named branch'), -- ('l', 'limit', '', -- 'limit number of changes displayed'), -- ('d', 'date', '', -- 'show revisions matching date spec'), -- ('u', 'user', [], -- 'revisions committed by user'), -- ('', 'from', '', -- ''), -- ('', 'to', '', -- ''), -- ('', 'rhbranch', '', -- ''), -- ('', 'template', '', -- 'display with template')], -- 'hg rhlog [OPTION]... [FILE]') -+ return commands.diff(ui, repo, *map(unquoteplus, pats), **opts) -+ -+@command(b'rhlog', -+ [ -+ (b'r', b'rev', [], b'show the specified revision'), -+ (b'b', b'branch', [], -+ b'show changesets within the given named branch'), -+ (b'l', b'limit', b'', -+ b'limit number of changes displayed'), -+ (b'd', b'date', b'', -+ b'show revisions matching date spec'), -+ (b'u', b'user', [], -+ b'revisions committed by user'), -+ (b'', b'from', b'', -+ b''), -+ (b'', b'to', b'', -+ b''), -+ (b'', b'rhbranch', b'', -+ b''), -+ (b'', b'template', b'', -+ b'display with template')], -+ b'hg rhlog [OPTION]... [FILE]') -+ - def rhlog(ui, repo, *pats, **opts): - rev = opts.pop('rev') - bra0 = opts.pop('branch') -- from_rev = urllib.unquote_plus(opts.pop('from', None)) -- to_rev = urllib.unquote_plus(opts.pop('to' , None)) -- bra = urllib.unquote_plus(opts.pop('rhbranch', None)) -- from_rev = from_rev.replace('"', '\\"') -- to_rev = to_rev.replace('"', '\\"') -- if hg.util.version() >= '1.6': -- opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)] -+ from_rev = unquoteplus(opts.pop('from', b'')) -+ to_rev = unquoteplus(opts.pop('to' , b'')) -+ bra = unquoteplus(opts.pop('rhbranch', b'')) -+ from_rev = from_rev.replace(b'"', b'\\"') -+ to_rev = to_rev.replace(b'"', b'\\"') -+ if (from_rev != b'') or (to_rev != b''): -+ if from_rev != b'': -+ quotefrom = b'"%s"' % (from_rev) -+ else: -+ quotefrom = from_rev -+ if to_rev != b'': -+ quoteto = b'"%s"' % (to_rev) -+ else: -+ quoteto = to_rev -+ opts['rev'] = [b'%s:%s' % (quotefrom, quoteto)] - else: -- opts['rev'] = ['%s:%s' % (from_rev, to_rev)] -- opts['branch'] = [bra] -- return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts) -- --@command('rhmanifest', -- [('r', 'rev', '', 'show the specified revision')], -- 'hg rhmanifest [-r REV] [PATH]') --def rhmanifest(ui, repo, path='', **opts): -+ opts['rev'] = rev -+ if (bra != b''): -+ opts['branch'] = [bra] -+ return commands.log(ui, repo, *map(unquoteplus, pats), **opts) -+ -+ -+@command(b'rhmanifest', -+ [(b'r', b'rev', b'', b'show the specified revision')], -+ b'hg rhmanifest -r REV [PATH]') -+def rhmanifest(ui, repo, path=b'', **opts): - """output the sub-manifest of the specified directory""" -- ui.write('<?xml version="1.0"?>\n') -- ui.write('<rhmanifest>\n') -- ui.write('<repository root="%s">\n' % _u(repo.root)) -+ ui.write(b'<?xml version="1.0"?>\n') -+ ui.write(b'<rhmanifest>\n') -+ ui.write(b'<repository root="%s">\n' % _u(repo.root)) - try: -- _manifest(ui, repo, urllib.unquote_plus(path), urllib.unquote_plus(opts.get('rev'))) -+ _manifest(ui, repo, unquoteplus(path), unquoteplus(opts.get('rev'))) - finally: -- ui.write('</repository>\n') -- ui.write('</rhmanifest>\n') -+ ui.write(b'</repository>\n') -+ ui.write(b'</rhmanifest>\n') - --@command('rhsummary',[], 'hg rhsummary') -+@command(b'rhsummary',[], b'hg rhsummary') - def rhsummary(ui, repo, **opts): - """output the summary of the repository""" -- ui.write('<?xml version="1.0"?>\n') -- ui.write('<rhsummary>\n') -- ui.write('<repository root="%s">\n' % _u(repo.root)) -+ ui.write(b'<?xml version="1.0"?>\n') -+ ui.write(b'<rhsummary>\n') -+ ui.write(b'<repository root="%s">\n' % _u(repo.root)) - try: - _tip(ui, repo) - _tags(ui, repo) - _branches(ui, repo) - # TODO: bookmarks in core (Mercurial>=1.8) - finally: -- ui.write('</repository>\n') -- ui.write('</rhsummary>\n') -+ ui.write(b'</repository>\n') -+ ui.write(b'</rhsummary>\n') - diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile deleted file mode 100644 index 326f0e0bab0b3..0000000000000 --- a/pkgs/applications/version-management/redmine/Gemfile +++ /dev/null @@ -1,107 +0,0 @@ -source 'https://rubygems.org' - -ruby '>= 2.5.0', '< 3.2.0' -gem 'bundler', '>= 1.12.0' - -gem 'rails', '6.1.7.6' -gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') -gem 'rouge', '~> 3.28.0' -gem 'request_store', '~> 1.5.0' -gem 'mini_mime', '~> 1.1.0' -gem "actionpack-xml_parser" -gem 'roadie-rails', (Gem.ruby_version < Gem::Version.new('2.6.0') ? '~> 2.2.0' : '~> 3.0.0') -gem 'marcel' -gem "mail", "~> 2.7.1" -gem 'csv', '~> 3.2.0' -gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.6.0') - '~> 1.12.5' - elsif Gem.ruby_version < Gem::Version.new('2.7.0') - '~> 1.13.10' - else - '~> 1.15.2' - end) -gem "rexml", require: false if Gem.ruby_version >= Gem::Version.new('3.0') -gem 'i18n', '~> 1.10.0' -gem 'rbpdf', '~> 1.21.3' -gem 'addressable' -gem 'rubyzip', '~> 2.3.0' -gem 'net-smtp', '~> 0.3.0' -gem 'net-imap', '~> 0.2.2' -gem 'net-pop', '~> 0.1.1' -# Rails 6.1.6.1 does not work with Pysch 3.0.2, which is installed by default with Ruby 2.5. See https://github.com/rails/rails/issues/45590 -gem 'psych', '>= 3.1.0' if Gem.ruby_version < Gem::Version.new('2.6.0') - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] - -# TOTP-based 2-factor authentication -gem 'rotp', '>= 5.0.0' -gem 'rqrcode' - -# Optional gem for LDAP authentication -group :ldap do - gem 'net-ldap', '~> 0.17.0' -end - -# Optional gem for exporting the gantt to a PNG file -group :minimagick do - gem 'mini_magick', '~> 4.11.0' -end - -# Optional Markdown support, not for JRuby -# ToDo: Remove common_mark group when common_mark is decoupled from markdown. See defect (#36892) for more details. -gem 'redcarpet', '~> 3.5.1', groups: [:markdown, :common_mark] - -# Optional CommonMark support, not for JRuby -group :common_mark do - gem "html-pipeline", "~> 2.13.2" - gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') - gem "sanitize", "~> 6.0" - gem 'deckar01-task_list', '2.3.2' -end - -# webrick -gem 'webrick' - -# Include database gems for the database adapters NixOS supports -require 'erb' -require 'yaml' -gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] -gem "pg", "~> 1.4.2", :platforms => [:mri, :mingw, :x64_mingw] - -group :development do - gem 'listen', '~> 3.3' - gem "yard" -end - -group :test do - gem "rails-dom-testing" - gem 'mocha', '>= 2.0.1' - gem 'simplecov', '~> 0.21.2', :require => false - gem "ffi", platforms: [:mri, :mingw, :x64_mingw, :mswin] - # For running system tests - gem 'puma', (Gem.ruby_version < Gem::Version.new('2.7') ? '< 6.0.0' : '>= 0') - gem 'capybara', (if Gem.ruby_version < Gem::Version.new('2.6') - '~> 3.35.3' - elsif Gem.ruby_version < Gem::Version.new('2.7') - '~> 3.36.0' - else - '~> 3.38.0' - end) - gem "selenium-webdriver", "~> 3.142.7" - gem 'webdrivers', '4.6.1', require: false - # RuboCop - gem 'rubocop', '~> 1.26.0' - gem 'rubocop-performance', '~> 1.13.0' - gem 'rubocop-rails', '~> 2.14.0' -end - -local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exist?(local_gemfile) - eval_gemfile local_gemfile -end - -# Load plugins' Gemfiles -Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| - eval_gemfile file -end diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock deleted file mode 100644 index f9efc5ecede6a..0000000000000 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ /dev/null @@ -1,313 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) - mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionpack-xml_parser (2.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) - nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.6) - activesupport (= 6.1.7.6) - globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - builder (3.2.4) - capybara (3.38.0) - addressable - matrix - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (>= 1.5, < 3.0) - xpath (~> 3.2) - childprocess (3.0.0) - chunky_png (1.4.0) - commonmarker (0.23.10) - concurrent-ruby (1.2.2) - crass (1.0.6) - css_parser (1.16.0) - addressable - csv (3.2.8) - deckar01-task_list (2.3.2) - html-pipeline - digest (3.1.1) - docile (1.4.0) - erubi (1.12.0) - ffi (1.16.3) - globalid (1.2.1) - activesupport (>= 6.1) - html-pipeline (2.13.2) - activesupport (>= 2) - nokogiri (>= 1.4) - htmlentities (4.3.4) - i18n (1.10.0) - concurrent-ruby (~> 1.0) - listen (3.8.0) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.22.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - matrix (0.4.2) - method_source (1.0.0) - mini_magick (4.11.0) - mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.20.0) - mocha (2.1.0) - ruby2_keywords (>= 0.0.5) - mysql2 (0.5.5) - net-imap (0.2.3) - digest - net-protocol - strscan - net-ldap (0.17.1) - net-pop (0.1.2) - net-protocol - net-protocol (0.2.2) - timeout - net-smtp (0.3.3) - net-protocol - nio4r (2.6.1) - nokogiri (1.15.5) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) - ast (~> 2.4.1) - racc - pg (1.4.6) - public_suffix (5.0.4) - puma (6.4.0) - nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.8) - rack-test (2.1.0) - rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) - bundler (>= 1.15.0) - railties (= 6.1.7.6) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) - activesupport (>= 5.0.0) - minitest - nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) - loofah (~> 2.21) - nokogiri (~> 1.14) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) - method_source - rake (>= 12.2) - thor (~> 1.0) - rainbow (3.1.1) - rake (13.1.0) - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rbpdf (1.21.3) - htmlentities - rbpdf-font (~> 1.19.0) - rbpdf-font (1.19.1) - redcarpet (3.5.1) - regexp_parser (2.8.2) - request_store (1.5.1) - rack (>= 1.4) - rexml (3.2.6) - roadie (5.2.0) - css_parser (~> 1.4) - nokogiri (~> 1.15) - roadie-rails (3.0.0) - railties (>= 5.1, < 7.1) - roadie (~> 5.0) - rotp (6.3.0) - rouge (3.28.0) - rqrcode (2.2.0) - chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) - rubocop (1.26.1) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) - rubocop-performance (1.13.3) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.14.2) - activesupport (>= 4.2.0) - rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) - ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) - sanitize (6.1.0) - crass (~> 1.0.2) - nokogiri (>= 1.12.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - strscan (3.0.7) - thor (1.3.0) - timeout (0.4.1) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - webdrivers (4.6.1) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) - webrick (1.8.1) - websocket-driver (0.7.6) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - yard (0.9.34) - zeitwerk (2.6.12) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack-xml_parser - addressable - bundler (>= 1.12.0) - capybara (~> 3.38.0) - commonmarker (~> 0.23.8) - csv (~> 3.2.0) - deckar01-task_list (= 2.3.2) - ffi - html-pipeline (~> 2.13.2) - i18n (~> 1.10.0) - listen (~> 3.3) - mail (~> 2.7.1) - marcel - mini_magick (~> 4.11.0) - mini_mime (~> 1.1.0) - mocha (>= 2.0.1) - mysql2 (~> 0.5.0) - net-imap (~> 0.2.2) - net-ldap (~> 0.17.0) - net-pop (~> 0.1.1) - net-smtp (~> 0.3.0) - nokogiri (~> 1.15.2) - pg (~> 1.4.2) - puma - rails (= 6.1.7.6) - rails-dom-testing - rbpdf (~> 1.21.3) - redcarpet (~> 3.5.1) - request_store (~> 1.5.0) - rexml - roadie-rails (~> 3.0.0) - rotp (>= 5.0.0) - rouge (~> 3.28.0) - rqrcode - rubocop (~> 1.26.0) - rubocop-performance (~> 1.13.0) - rubocop-rails (~> 2.14.0) - rubyzip (~> 2.3.0) - sanitize (~> 6.0) - selenium-webdriver (~> 3.142.7) - simplecov (~> 0.21.2) - tzinfo-data - webdrivers (= 4.6.1) - webrick - yard - -RUBY VERSION - ruby 3.1.4p223 - -BUNDLED WITH - 2.4.12 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix deleted file mode 100644 index 1235df9f67207..0000000000000 --- a/pkgs/applications/version-management/redmine/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, bundlerEnv, ruby, defaultGemConfig, makeWrapper, nixosTests }: - -let - version = "5.0.6"; - rubyEnv = bundlerEnv { - name = "redmine-env-${version}"; - - inherit ruby; - gemdir = ./.; - groups = [ "development" "ldap" "markdown" "common_mark" "minimagick" "test" ]; - }; -in - stdenv.mkDerivation rec { - pname = "redmine"; - inherit version; - - src = fetchurl { - url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-SI/gjzeo6xARQVkiqOp0O3842Kel+IIpUKNKN13PCO4="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; - - # taken from https://www.redmine.org/issues/33784 - # can be dropped when the upstream bug is closed and the fix is present in the upstream release - patches = [ ./0001-python3.patch ]; - - buildPhase = '' - mv config config.dist - mv public/themes public/themes.dist - ''; - - installPhase = '' - mkdir -p $out/bin $out/share - cp -r . $out/share/redmine - for i in config files log plugins public/plugin_assets public/themes tmp; do - rm -rf $out/share/redmine/$i - ln -fs /run/redmine/$i $out/share/redmine/$i - done - - makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb - ''; - - passthru.tests.redmine = nixosTests.redmine; - - meta = with lib; { - homepage = "https://www.redmine.org/"; - platforms = platforms.linux; - maintainers = with maintainers; [ aanderse felixsinger megheaiulian ]; - license = licenses.gpl2; - }; - } diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix deleted file mode 100644 index bfd433274b05e..0000000000000 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ /dev/null @@ -1,1132 +0,0 @@ -{ - actioncable = { - dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fdbks9byqqlkd6glj6lkz5f1z6948hh8fhv9x5pzqciralmz142"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rfya6qgsl14cm9l2w7h7lg4znsyg3gqiskhqr8wn76sh0x2hln0"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jr9jpf542svzqz8x68s08jnf30shxrrh7rq1a0s7jia5a5zx3qd"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vf6ncs647psa9p23d2108zgmlf0pr7gcjr080yg5yf68gyhs53k"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - actionpack-xml_parser = { - dependencies = ["actionpack" "railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; - type = "gem"; - }; - version = "2.0.1"; - }; - actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i8s3v6m8q3y17c40l6d3k2vs1mdqr0y1lfm7i6dfbj2y673lk9r"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s4c1n5lv31sc7w4w74xz8gzyq3sann00bm4l7lxgy3vgi2wqkid"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - activejob = { - dependencies = ["activesupport" "globalid"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1641003plszig5ybhrqy90fv43l1vcai5h35qmhh9j12byk5hp26"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - activemodel = { - dependencies = ["activesupport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "148szdj5jlnfpv3nmy8cby8rxgpdvs43f3rzqby1f7a0l2knd3va"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - activerecord = { - dependencies = ["activemodel" "activesupport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0n7hg582ajdncilfk1kkw8qfdchymp2gqgkad1znlhlmclihsafr"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - activestorage = { - dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16pylwnqsbvq2wxhl7k1rnravbr3dgpjmnj0psz5gijgkydd52yc"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; - type = "gem"; - }; - version = "2.8.5"; - }; - ast = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - builder = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - capybara = { - dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "123198zk2ak8mziwa5jc3ckgpmsg08zn064n3aywnqm9s1bwjv3v"; - type = "gem"; - }; - version = "3.38.0"; - }; - childprocess = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; - type = "gem"; - }; - version = "3.0.0"; - }; - chunky_png = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; - type = "gem"; - }; - version = "1.4.0"; - }; - commonmarker = { - groups = ["common_mark"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; - type = "gem"; - }; - version = "0.23.10"; - }; - concurrent-ruby = { - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; - type = "gem"; - }; - version = "1.2.2"; - }; - crass = { - groups = ["common_mark" "default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; - type = "gem"; - }; - version = "1.0.6"; - }; - css_parser = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp"; - type = "gem"; - }; - version = "1.16.0"; - }; - csv = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zmrgngggg4yvdbggdx9p3z4wcav4vxfigramxxvjh3hi7l12pig"; - type = "gem"; - }; - version = "3.2.8"; - }; - deckar01-task_list = { - dependencies = ["html-pipeline"]; - groups = ["common_mark"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; - type = "gem"; - }; - version = "2.3.2"; - }; - digest = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01qkpbkxq83ip3iysfh2kjrg9sh2n2q91prhyxh3vq10lcfzv9l1"; - type = "gem"; - }; - version = "3.1.1"; - }; - docile = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; - type = "gem"; - }; - version = "1.4.0"; - }; - erubi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; - type = "gem"; - }; - version = "1.12.0"; - }; - ffi = { - groups = ["default" "development" "test"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "mswin"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; - type = "gem"; - }; - version = "1.16.3"; - }; - globalid = { - dependencies = ["activesupport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh"; - type = "gem"; - }; - version = "1.2.1"; - }; - html-pipeline = { - dependencies = ["activesupport" "nokogiri"]; - groups = ["common_mark"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00xqmlny1b4ixff8sk0rkl4wcgwqc6v93qv8l3rn8d1dppvq7pm1"; - type = "gem"; - }; - version = "2.13.2"; - }; - htmlentities = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - i18n = { - dependencies = ["concurrent-ruby"]; - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; - type = "gem"; - }; - version = "1.10.0"; - }; - listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; - type = "gem"; - }; - version = "3.8.0"; - }; - loofah = { - dependencies = ["crass" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; - type = "gem"; - }; - version = "2.22.0"; - }; - mail = { - dependencies = ["mini_mime"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; - type = "gem"; - }; - version = "2.7.1"; - }; - marcel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; - type = "gem"; - }; - version = "1.0.2"; - }; - matrix = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; - type = "gem"; - }; - version = "0.4.2"; - }; - method_source = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; - }; - mini_magick = { - groups = ["minimagick"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; - type = "gem"; - }; - version = "4.11.0"; - }; - mini_mime = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6"; - type = "gem"; - }; - version = "1.1.5"; - }; - mini_portile2 = { - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; - type = "gem"; - }; - version = "2.8.5"; - }; - minitest = { - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; - type = "gem"; - }; - version = "5.20.0"; - }; - mocha = { - dependencies = ["ruby2_keywords"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lsll8iba8612dypk718l9kx73m9syiscb2rhciljys1krc5g1zr"; - type = "gem"; - }; - version = "2.1.0"; - }; - mysql2 = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gjvj215qdhwk3292sc7xsn6fmwnnaq2xs35hh5hc8d8j22izlbn"; - type = "gem"; - }; - version = "0.5.5"; - }; - net-imap = { - dependencies = ["digest" "net-protocol" "strscan"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; - type = "gem"; - }; - version = "0.2.3"; - }; - net-ldap = { - groups = ["ldap"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; - type = "gem"; - }; - version = "0.17.1"; - }; - net-pop = { - dependencies = ["net-protocol"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; - type = "gem"; - }; - version = "0.1.2"; - }; - net-protocol = { - dependencies = ["timeout"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; - type = "gem"; - }; - version = "0.2.2"; - }; - net-smtp = { - dependencies = ["net-protocol"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; - type = "gem"; - }; - version = "0.3.3"; - }; - nio4r = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y99dfzlb3kgzh7pfk8km0p5zjiblxyh5rm8yal9h523vi5awji8"; - type = "gem"; - }; - version = "2.6.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; - type = "gem"; - }; - version = "1.15.5"; - }; - parallel = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; - type = "gem"; - }; - version = "1.23.0"; - }; - parser = { - dependencies = ["ast" "racc"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; - type = "gem"; - }; - version = "3.2.2.4"; - }; - pg = { - groups = ["default"]; - platforms = [{ - engine = "maglev"; - } { - engine = "mingw"; - } { - engine = "mingw"; - } { - engine = "ruby"; - }]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; - type = "gem"; - }; - version = "1.4.6"; - }; - public_suffix = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; - type = "gem"; - }; - version = "5.0.4"; - }; - puma = { - dependencies = ["nio4r"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; - type = "gem"; - }; - version = "6.4.0"; - }; - racc = { - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; - type = "gem"; - }; - version = "1.7.3"; - }; - rack = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; - type = "gem"; - }; - version = "2.2.8"; - }; - rack-test = { - dependencies = ["rack"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; - type = "gem"; - }; - version = "2.1.0"; - }; - rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gf5dqabzd0mf0q39a07kf0smdm2cv2z5swl3zr4cz50yb85zz3l"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - rails-dom-testing = { - dependencies = ["activesupport" "minitest" "nokogiri"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; - type = "gem"; - }; - version = "2.2.0"; - }; - rails-html-sanitizer = { - dependencies = ["loofah" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; - type = "gem"; - }; - version = "1.6.0"; - }; - railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vq4ahyg9hraixxmmwwypdnpcylpvznvdxhj4xa23xk45wzbl3h7"; - type = "gem"; - }; - version = "6.1.7.6"; - }; - rainbow = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rake = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; - type = "gem"; - }; - version = "13.1.0"; - }; - rb-fsevent = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; - type = "gem"; - }; - version = "0.11.2"; - }; - rb-inotify = { - dependencies = ["ffi"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; - type = "gem"; - }; - version = "0.10.1"; - }; - rbpdf = { - dependencies = ["htmlentities" "rbpdf-font"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rb6zqx79fzi0gqdq8xbhp87yp1ldfmzh0kng6fph84qhmzs990n"; - type = "gem"; - }; - version = "1.21.3"; - }; - rbpdf-font = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; - type = "gem"; - }; - version = "1.19.1"; - }; - redcarpet = { - groups = ["common_mark" "markdown"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; - type = "gem"; - }; - version = "3.5.1"; - }; - regexp_parser = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d9a5s3qrjdy50ll2s32gg3qmf10ryp3v2nr5k718kvfadp50ray"; - type = "gem"; - }; - version = "2.8.2"; - }; - request_store = { - dependencies = ["rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; - type = "gem"; - }; - version = "1.5.1"; - }; - rexml = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - roadie = { - dependencies = ["css_parser" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qs594ybaz0lh2sakh95syzvhva4jms8xyiwhgjfncf3ri0qxp7l"; - type = "gem"; - }; - version = "5.2.0"; - }; - roadie-rails = { - dependencies = ["railties" "roadie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16j1cjhq8xqr77vyf7m7ip2132619wdnpvlbig4cnn96yyi0cnan"; - type = "gem"; - }; - version = "3.0.0"; - }; - rotp = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m48hv6wpmmm6cjr6q92q78h1i610riml19k5h1dil2yws3h1m3m"; - type = "gem"; - }; - version = "6.3.0"; - }; - rouge = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "080fswzii68wnbsg7pgq55ba7p289sqjlxwp4vch0h32qy1f8v8d"; - type = "gem"; - }; - version = "3.28.0"; - }; - rqrcode = { - dependencies = ["chunky_png" "rqrcode_core"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; - type = "gem"; - }; - version = "2.2.0"; - }; - rqrcode_core = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; - type = "gem"; - }; - version = "1.2.0"; - }; - rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl"; - type = "gem"; - }; - version = "1.26.1"; - }; - rubocop-ast = { - dependencies = ["parser"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cs9cc5p9q70valk4na3lki4xs88b52486p2v46yx3q1n5969bgs"; - type = "gem"; - }; - version = "1.30.0"; - }; - rubocop-performance = { - dependencies = ["rubocop" "rubocop-ast"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17ny81dy5gjrvris8mni7la8yjg57snphyg9nmvnc3al7yhwr74x"; - type = "gem"; - }; - version = "1.13.3"; - }; - rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14xagb3jbms5mlcf932kx1djn2q4k952d4xia75ll36vh7xf2fpp"; - type = "gem"; - }; - version = "2.14.2"; - }; - ruby-progressbar = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; - type = "gem"; - }; - version = "1.13.0"; - }; - ruby2_keywords = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; - type = "gem"; - }; - version = "0.0.5"; - }; - rubyzip = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - sanitize = { - dependencies = ["crass" "nokogiri"]; - groups = ["common_mark"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wsw05y0h1ln3x2kvcw26fs9ivryb4xbjrb4hsk2pishkhydkz4j"; - type = "gem"; - }; - version = "6.1.0"; - }; - selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; - type = "gem"; - }; - version = "3.142.7"; - }; - simplecov = { - dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; - type = "gem"; - }; - version = "0.21.2"; - }; - simplecov-html = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; - type = "gem"; - }; - version = "0.12.3"; - }; - simplecov_json_formatter = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; - type = "gem"; - }; - version = "0.1.4"; - }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm"; - type = "gem"; - }; - version = "4.2.1"; - }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; - type = "gem"; - }; - version = "3.4.2"; - }; - strscan = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w2lc1mqia13x43ajzhih419r40ppddg936ydhawz57f63ab6fll"; - type = "gem"; - }; - version = "3.0.7"; - }; - thor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; - type = "gem"; - }; - version = "1.3.0"; - }; - timeout = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; - type = "gem"; - }; - version = "0.4.1"; - }; - tzinfo = { - dependencies = ["concurrent-ruby"]; - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; - unicode-display_width = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; - type = "gem"; - }; - version = "2.5.0"; - }; - webdrivers = { - dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; - type = "gem"; - }; - version = "4.6.1"; - }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; - type = "gem"; - }; - version = "1.8.1"; - }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; - type = "gem"; - }; - version = "0.7.6"; - }; - websocket-extensions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; - type = "gem"; - }; - version = "0.1.5"; - }; - xpath = { - dependencies = ["nokogiri"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; - yard = { - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; - type = "gem"; - }; - version = "0.9.34"; - }; - zeitwerk = { - groups = ["common_mark" "default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; - type = "gem"; - }; - version = "2.6.12"; - }; -} diff --git a/pkgs/applications/version-management/redmine/update.sh b/pkgs/applications/version-management/redmine/update.sh deleted file mode 100755 index 3c4d842735cfd..0000000000000 --- a/pkgs/applications/version-management/redmine/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p cacert bundix bundler - -# Do these steps before running this script: -# 1. Copy Gemfile from new Redmine version to this folder -# 2. Manually modify the database lines in Gemfile (diff the two files, it's obvious) - -pkg_dir="$(dirname "$0")" -cd ${pkg_dir} - -for file in "gemset.nix" "Gemfile.lock"; do - if [ -f ${file} ]; then - rm ${file} - fi -done - -bundle lock --add-platform ruby -bundle lock --remove-platform x86_64-linux -bundix -l diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 0d99b350c0b82..c5f2adf153f56 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -13,7 +13,7 @@ , fetchYarnDeps , yarn , nodejs -, prefetch-yarn-deps +, fixup-yarn-lock , glibcLocales , libiconv , Cocoa @@ -66,7 +66,7 @@ let inherit version; nativeBuildInputs = [ - prefetch-yarn-deps + fixup-yarn-lock nodejs yarn ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index d44193ea4c96b..72d69678fb75c 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -16,28 +16,28 @@ , setuptools }: let - version = "0.89.13"; + version = "0.89.15"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.39"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-JpRVRzuHB6cgk/qW1j4zF8/K1xwz3J4nZhijmz5kVWU="; + hash = "sha256-rmNaBnTPDDQO/ImkGkMwW8fyjQyBUBchTEnbtAK24pw="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A="; + vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; } // gqlgen); buildsrht-worker = buildGoModule ({ inherit src version; pname = "buildsrht-worker"; modRoot = "worker"; - vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A="; + vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 33c5d4eab0c59..c0180cf805fac 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "srht"; - version = "0.71.5"; + version = "0.71.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "core.sr.ht"; rev = version; - hash = "sha256-YIoKOiTi/9X4bSiG+GvnwzvKYhbfywrv/dTjxaJOOTQ="; + hash = "sha256-rDpm2HJOWScvIxOmHcat6y4CWdBE9T2gE/jZskYAFB0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index ee598c5ed9144..42ec1589a643c 100644 --- a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -1,13 +1,13 @@ { unzip -, gqlgenVersion ? "0.17.42" +, gqlgenVersion }: { overrideModAttrs = (_: { # No need to workaround -trimpath: it's not used in goModules, # but do download `go generate`'s dependencies nonetheless. preBuild = '' - go generate ./loaders - go generate ./graph + if [ -d ./loaders ]; then go generate ./loaders; fi + if [ -d ./graph ]; then go generate ./graph; fi ''; }); @@ -25,8 +25,8 @@ # If it fails, the gqlgenVersion may have to be updated. preBuild = '' unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip - go generate ./loaders - go generate ./graph + if [ -d ./loaders ]; then go generate ./loaders; fi + if [ -d ./graph ]; then go generate ./graph; fi rm -rf github.com ''; } diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index aeda66fc51e97..d7ffc0e2cf83d 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -13,28 +13,28 @@ , setuptools }: let - version = "0.85.7"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; }; + version = "0.85.9"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.42"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - hash = "sha256-jkESrrVE+0O2g64zzPOpqhl8DpvmosQvuF0s6Xd+lbM="; + hash = "sha256-tmbBw6x3nqN9nRIR3xOXQ+L5EACXLQYLXQYK3lsOsAI="; }; gitApi = buildGoModule ({ inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; } // gqlgen); gitDispatch = buildGoModule ({ inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-dispatch/main.go \ @@ -46,7 +46,7 @@ let inherit src version; pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-keys/main.go \ @@ -58,7 +58,7 @@ let inherit src version; pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-shell/main.go \ @@ -70,7 +70,7 @@ let inherit src version; pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-update-hook/main.go \ diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index b4219b0a8396d..3e7e1f55c65a9 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -14,8 +14,8 @@ }: let - version = "0.32.4"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; + version = "0.33.0"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; pyproject = true; @@ -25,7 +25,7 @@ let owner = "~sircmpwn"; repo = "hg.sr.ht"; rev = version; - hash = "sha256-mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60="; + hash = "sha256-+BYeE+8dXY/MLLYyBBLD+eKqmrPiKyyCGIZLkCPzNYM="; vc = "hg"; }; @@ -33,7 +33,7 @@ let inherit src version; pname = "hgsrht-api"; modRoot = "api"; - vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs="; + vendorHash = "sha256-K+KMhcvkG/qeQTnlHS4xhLCcvBQNNp2DcScJPm8Dbic="; } // gqlgen); hgsrht-keys = buildGoModule { diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index b46e1c3508d7a..4a0d2cda89312 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -12,21 +12,21 @@ }: let - version = "0.17.5"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.41"; }; + version = "0.17.7"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - hash = "sha256-GbBxK3XE+Y6Jiap0Nxa8vk4Kv6IbcdSi4NN59AeKwjA="; + hash = "sha256-IyY7Niy/vZSAXjYZMlxY6uuQ8nH/4yT4+MaRjHtl6G4="; }; hubsrht-api = buildGoModule ({ inherit src version; pname = "hubsrht-api"; modRoot = "api"; - vendorHash = "sha256-wmuM0SxQbohTDaU8zmkw1TQTmqhOy1yAl1jRWk6TKL8="; + vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 09431389ccc18..77d499f695e46 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -15,21 +15,21 @@ }: let - version = "0.57.14"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.57.18"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - hash = "sha256-rzOxlat7Lbgt0Wl6vvnAC+fS3MynFVKFvVdIdxgA5e0="; + hash = "sha256-l+QPocnwHTjrU+M0wnm4tBrbz8KmSb6DovC+skuAnLc="; }; listssrht-api = buildGoModule ({ inherit src version; pname = "listssrht-api"; modRoot = "api"; - vendorHash = "sha256-OWgrPvXVlvJPcoABP0ZxKzoYFhU44j/I44sBBRbd6KY="; + vendorHash = "sha256-UeVs/+uZNtv296bzXIBio2wcg3Uzu3fBM4APzF9O0hY="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index e6d208ab04676..f5cd6be139acd 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -12,21 +12,21 @@ }: let - version = "0.16.3"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.16.5"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - hash = "sha256-o1A3LmwH6WgpFqjKyL3UTru9q7TgKdOdbKZfJHR6fCA="; + hash = "sha256-JFMtif2kIE/fs5PNcQtkJikAFNszgZTU7BG/8fTncTI="; }; mansrht-api = buildGoModule ({ inherit src version; pname = "mansrht-api"; modRoot = "api"; - vendorHash = "sha256-6AzKWytdyuofCFaDEdeO24mv1mtpnQEJydrjVWGY2eU="; + vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index c2b835c2d53d5..8ae078bea5f1e 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -18,21 +18,21 @@ , setuptools }: let - version = "0.68.5"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.69.8"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - hash = "sha256-mwUqBzi7nMTZL7uwv7hBjGkO8U3krXXpvfUCaYHgHBU="; + hash = "sha256-K7p6cytkPYgUuYr7BVfU/+sVbSr2YEmreIDnTatUMyk="; }; metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; modRoot = "api"; - vendorHash = "sha256-4T1xnHDjxsIyddA51exNwwz6ZWeuT7N8LBsCJ7c8sRI="; + vendorHash = "sha256-vIkUK1pigVU8vZL5xpHLeinOga5eXXHTuDkHxwUz6uM="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index 54b2027563092..5fc140548dc7a 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -6,21 +6,25 @@ buildGoModule (rec { pname = "pagessrht"; - version = "0.15.4"; + version = "0.15.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - hash = "sha256-3kdQVIL7xaIPu2elxj1k+4/y75bd+OKP5+VPSniF7w8="; + hash = "sha256-Lobuf12ybSO7Y4ztOLMFW0dmPFaBSEPCy4Nmh89tylI="; }; postPatch = '' substituteInPlace Makefile \ --replace "all: server" "" + + # fix build failure due to unused import + substituteInPlace server.go \ + --replace-warn ' "fmt"' "" ''; - vendorHash = "sha256-DP+6rxjiXzs0RbSuMD20XwO/+v7QXCNgXj2LxZ96lWE="; + vendorHash = "sha256-9hpOkP6AYSZe7MW1mrwFEKq7TvVt6OcF6eHWY4jARuU="; postInstall = '' mkdir -p $out/share/sql/ @@ -36,4 +40,4 @@ buildGoModule (rec { }; # There is no ./loaders but this does not cause troubles # to go generate -} // import ./fix-gqlgen-trimpath.nix { inherit unzip; }) +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.42"; }) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index f8d4f27a7ddcc..b7e6624928966 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -12,21 +12,21 @@ }: let - version = "0.15.2"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; + version = "0.15.4"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - hash = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ="; + hash = "sha256-M38hAMRdMzcqxJv7j7foOIYEImr/ZYz/lbYOF9R9g2M="; }; pastesrht-api = buildGoModule ({ inherit src version; pname = "pastesrht-api"; modRoot = "api"; - vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4="; + vendorHash = "sha256-vt5nSPcx+Y/SaWcqjV38DTL3ZtzmdjbkJYMv5Fhhnq4="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index a5bbc43b3f45c..a60eb4b747885 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.23"; + version = "0.22.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - hash = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; + hash = "sha256-9IgMmYzInfrten7z8bznlSFJlUjHf3k3z76lkP6tP50="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 11c762592bb77..1f81727283911 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -13,21 +13,21 @@ }: let - version = "0.75.6"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.75.10"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - hash = "sha256-BPJ1M9dX+xNIw++VZ0Si/rjnfI9BY95TE2o+u7JRVAU="; + hash = "sha256-3dVZdupsygM7/6T1Mn7yRc776aa9pKgwF0hgZX6uVQ0="; }; todosrht-api = buildGoModule ({ inherit src version; pname = "todosrht-api"; modRoot = "api"; - vendorHash = "sha256-vTKIJFE8AFR2eZFwG9ba6FWPW02og3ZVcrsqUnOkJIQ="; + vendorHash = "sha256-fImOQLnQLHTrg5ikuYRZ+u+78exAiYA19DGQoUjQBOM="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index e9efc0816eb13..e5dd0b5baed04 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p git mercurial common-updater-scripts +#! nix-shell -i bash -p gnused git mercurial common-updater-scripts set -eux -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 @@ -34,21 +34,29 @@ get_latest_version() { rm -rf "$tmp" if [ "$1" = "hgsrht" ]; then hg clone "$src" "$tmp" >/dev/null - printf "%s" "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')" + printf "%s %s\n" \ + "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')" \ + "$(cd "$tmp" && sed -ne 's/^\s*github\.com\/99designs\/gqlgen v\(.*\)$/\1/p' go.mod)" else git clone "$src" "$tmp" >/dev/null - printf "%s" "$(cd "$tmp" && git describe "$(git rev-list --tags --max-count=1)")" + printf "%s %s\n" \ + "$(cd "$tmp" && git describe "$(git rev-list --tags --max-count=1)")" \ + "$(cd "$tmp" && sed -ne 's/^\s*github\.com\/99designs\/gqlgen v\(.*\)$/\1/p' go.mod)" fi } update_version() { default_nix="$(default "$1")" oldVersion="$(version "$1")" - version="$(get_latest_version "$1")" + read -r version gqlgen_ver < <(get_latest_version "$1") local p="$(attr_path "$1")" (cd "$root" && update-source-version "$p" "$version") + # update `gqlgenVersion` if necessary + old_gqlgen_ver="$(sed -ne 's/^.*gqlgenVersion = "\(.*\)".*$/\1/p' "$default_nix")" + sed -ri "s|gqlgenVersion = \"$old_gqlgen_ver\";|gqlgenVersion = \"$gqlgen_ver\";|w /dev/stdout" "$default_nix" + # Update vendorHash of Go modules retry=true while "$retry"; do @@ -63,7 +71,7 @@ update_version() { done done - if [ "$oldVersion" != "$version" ]; then + if [ "$oldVersion" != "$version" ] || [ "$old_gqlgen_ver" != "$gqlgen_ver" ]; then git add "$default_nix" git commit -m "sourcehut.$1: $oldVersion -> $version" fi diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 06de22c65b194..94583ba93bc8d 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.5"; + version = "2.4.6"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-zESuJJ68CCTGSDwGBeguAV78KETp+FUKnNNJx+4zorw="; + hash = "sha256-ZQU9AkemAMpMb2GhdfHaF6r6r6MbMXnmA0pq6Zq9Sek="; }; - cargoHash = "sha256-ITR6RREx55q3hxYrHj+fOv0C8fAzphR4q/A5tTd9CDg="; + cargoHash = "sha256-DHTo0jRZlLmw/B042uqzpMLUhBwm+sbFj9pze5l1Kpk="; 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 c3c7964b52a35..39157edf809ba 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,18 +1,49 @@ -{ buildVersion, aarch64sha256, x64sha256, dev ? false }: +{ + buildVersion, + dev ? false, + aarch64sha256, + x64sha256, +}: -{ fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook -, pkexecPath ? "/run/wrappers/bin/pkexec" -, writeShellScript, common-updater-scripts, curl, gnugrep, coreutils +{ + fetchurl, + lib, + stdenv, + xorg, + glib, + libGL, + glibcLocales, + gtk3, + cairo, + pango, + libredirect, + makeWrapper, + wrapGAppsHook, + pkexecPath ? "/run/wrappers/bin/pkexec", + writeShellScript, + common-updater-scripts, + curl, + gnugrep, + coreutils, }: let pnameBase = "sublime-merge"; packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_merge" crashHandlerBinary "git-credential-sublime" "ssh-askpass-sublime" ]; + binaries = [ + "sublime_merge" + crashHandlerBinary + "git-credential-sublime" + "ssh-askpass-sublime" + ]; primaryBinary = "sublime_merge"; - primaryBinaryAliases = [ "smerge" ]; - crashHandlerBinary = if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; - downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; + primaryBinaryAliases = [ + "smerge" + ]; + crashHandlerBinary = + if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; + downloadUrl = + arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; versionFile = builtins.toString ./default.nix; @@ -25,8 +56,12 @@ let curl ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; -in let + redirects = [ + "/usr/bin/pkexec=${pkexecPath}" + "/bin/true=${coreutils}/bin/true" + ]; +in +let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -35,13 +70,20 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ + glib + # for GSETTINGS_SCHEMAS_PATH + gtk3 + ]; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; buildPhase = '' runHook preBuild - for binary in ${ builtins.concatStringsSep " " binaries }; do + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ @@ -96,7 +138,8 @@ in let }; }; }; -in stdenv.mkDerivation (rec { +in +stdenv.mkDerivation (rec { pname = pnameBase; version = buildVersion; @@ -104,27 +147,45 @@ in stdenv.mkDerivation (rec { ${primaryBinary} = binaryPackage; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin" - makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" - '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + '' - mkdir -p "$out/share/applications" - substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" - for directory in ''$${primaryBinary}/Icon/*; do - size=$(basename $directory) - mkdir -p "$out/share/icons/hicolor/$size/apps" - ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps - done - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = + '' + mkdir -p "$out/bin" + makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" + '' + + builtins.concatStringsSep "" ( + map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases + ) + + '' + mkdir -p "$out/share/applications" + + substitute \ + "''$${primaryBinary}/${primaryBinary}.desktop" \ + "$out/share/applications/${primaryBinary}.desktop" \ + --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" + + for directory in ''$${primaryBinary}/Icon/*; do + size=$(basename $directory) + mkdir -p "$out/share/icons/hicolor/$size/apps" + ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps + done + ''; passthru = { updateScript = let script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + gnugrep + ] + } versionFile=$1 latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') @@ -141,7 +202,11 @@ in stdenv.mkDerivation (rec { update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; - in [ script versionFile ]; + in + [ + script + versionFile + ]; }; meta = with lib; { @@ -150,6 +215,9 @@ in stdenv.mkDerivation (rec { maintainers = with maintainers; [ zookatron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 068e9cca20aa6..07da8f64a6f75 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -2,17 +2,18 @@ let common = opts: callPackage (import ./common.nix opts); -in { +in +{ sublime-merge = common { buildVersion = "2091"; aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; - } {}; + } { }; sublime-merge-dev = common { - buildVersion = "2092"; - aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; - x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; + buildVersion = "2094"; dev = true; - } {}; + aarch64sha256 = "ZJgq971EPzq+BWxTQAoX6TgUmTfpf9sI4CHPcvgPTfI="; + x64sha256 = "6FLfszhP+BGHX5FrycMlznREmGDLyDyo6rgmqxhtCak="; + } { }; } diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index 1cce34df66adb..d7bd912b44d5a 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-VuuqR5fj0YvqIfVPH7N3rpAfIbcTwOx9W3H60saCToQ="; + sha256 = "sha256-RASZgQUlt/5ivImowM+sNw8Oe8aVkuUNErfgddmFjic="; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix index e9bc311c7ab21..5d5c8336987b8 100644 --- a/pkgs/applications/version-management/ungit/default.nix +++ b/pkgs/applications/version-management/ungit/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "ungit"; - version = "1.5.25"; + version = "1.5.26"; src = fetchFromGitHub { owner = "FredrikNoren"; repo = "ungit"; rev = "v${version}"; - hash = "sha256-mVBE8HW5dhi00BbVX00rgvc4JtyrTsbina18EzSUcuM="; + hash = "sha256-HTo0z/y7thUrDm6ofHiUtv1UDuqGN+kpMFLuIvxyxZQ="; }; - npmDepsHash = "sha256-DftAovQPKi4hLeqAGCVN8u/9eC4mkTxTJ2WxxOHbkgM="; + npmDepsHash = "sha256-f/CtNYoy5ZOgdVTG2ZdBpXOSNUKSG5wCy0eIl4ov80U="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix deleted file mode 100644 index 2c01d052eedab..0000000000000 --- a/pkgs/applications/video/aegisub/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ lib -, config -, stdenv -, fetchFromGitHub -, boost179 -, cmake -, expat -, harfbuzz -, ffmpeg -, ffms -, fftw -, fontconfig -, freetype -, fribidi -, glib -, icu -, intltool -, libGL -, libGLU -, libX11 -, libass -, libiconv -, libuchardet -, luajit -, pcre -, pkg-config -, which -, wrapGAppsHook -, wxGTK -, zlib - -, spellcheckSupport ? true -, hunspell ? null - -, openalSupport ? false -, openal ? null - -, alsaSupport ? stdenv.isLinux -, alsa-lib ? null - -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux -, libpulseaudio ? null - -, portaudioSupport ? false -, portaudio ? null - -, useBundledLuaJIT ? false -, darwin -}: - -assert spellcheckSupport -> (hunspell != null); -assert openalSupport -> (openal != null); -assert alsaSupport -> (alsa-lib != null); -assert pulseaudioSupport -> (libpulseaudio != null); -assert portaudioSupport -> (portaudio != null); - -let - luajit52 = luajit.override { enable52Compat = true; }; - inherit (lib) optional; - inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; -in -stdenv.mkDerivation rec { - pname = "aegisub"; - version = "3.3.3"; - - src = fetchFromGitHub { - owner = "wangqr"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78="; - }; - - nativeBuildInputs = [ - intltool - luajit52 - pkg-config - which - cmake - wrapGAppsHook - ]; - - buildInputs = [ - boost179 - expat - ffmpeg - ffms - fftw - fontconfig - freetype - fribidi - glib - harfbuzz - icu - libGL - libGLU - libX11 - libass - libiconv - libuchardet - pcre - wxGTK - zlib - ] - ++ lib.optionals stdenv.isDarwin [ - CoreText - CoreFoundation - AppKit - Carbon - IOKit - Cocoa - ] - ++ optional alsaSupport alsa-lib - ++ optional openalSupport openal - ++ optional portaudioSupport portaudio - ++ optional pulseaudioSupport libpulseaudio - ++ optional spellcheckSupport hunspell - ; - - enableParallelBuilding = true; - - hardeningDisable = [ - "bindnow" - "relro" - ]; - - patches = lib.optionals (!useBundledLuaJIT) [ - ./remove-bundled-luajit.patch - ]; - - # error: unknown type name 'NSUInteger' - postPatch = '' - substituteInPlace src/dialog_colorpicker.cpp \ - --replace "NSUInteger" "size_t" - ''; - - env.NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; - NIX_CFLAGS_LINK = "-L${luajit52}/lib"; - - configurePhase = '' - export FORCE_GIT_VERSION=${version} - # Workaround for a Nixpkgs bug; remove when the fix arrives - mkdir build-dir - cd build-dir - cmake -DCMAKE_INSTALL_PREFIX=$out .. - ''; - - meta = with lib; { - homepage = "https://github.com/wangqr/Aegisub"; - description = "An advanced subtitle editor"; - longDescription = '' - Aegisub is a free, cross-platform open source tool for creating and - modifying subtitles. Aegisub makes it quick and easy to time subtitles to - audio, and features many powerful tools for styling them, including a - built-in real-time video preview. - ''; - # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd - # softwares - so the resulting program will be GPL - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres wegank ]; - platforms = platforms.unix; - mainProgram = "aegisub"; - }; -} diff --git a/pkgs/applications/video/aegisub/remove-bundled-luajit.patch b/pkgs/applications/video/aegisub/remove-bundled-luajit.patch deleted file mode 100644 index d2b7dd0b5755e..0000000000000 --- a/pkgs/applications/video/aegisub/remove-bundled-luajit.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff --git a/CMakeLists.test.txt b/CMakeLists.test.txt -index 4d1a03177..62fab05c9 100644 ---- a/CMakeLists.test.txt -+++ b/CMakeLists.test.txt -@@ -2,7 +2,7 @@ if(UNIX) - add_executable(aegisub-lua EXCLUDE_FROM_ALL - automation/tests/aegisub.cpp - ) -- target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit "Boost::locale" "ICU::in") -+ target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit-5.1 "Boost::locale" "ICU::in") - add_custom_target(test-automation - COMMAND sh -c "$(luarocks path); ${PROJECT_BINARY_DIR}/aegisub-lua tests/busted.lua -p moon tests/modules" - VERBATIM -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce2e355ff..4d4396451 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,210 +13,6 @@ if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) - endif() - --## Build bundled LuaJIT with aegisub specific patches --add_executable(luajit-minilua vendor/luajit/src/host/minilua.c) --if(NOT WIN32) -- target_link_libraries(luajit-minilua m) --endif() --if(WIN32) -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -D P64 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- else() -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- endif() --elseif(APPLE) -- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- else() -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- endif() --else() -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- else() -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" -- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" -- COMMAND luajit-minilua ../dynasm/dynasm.lua -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src -- ) -- endif() --endif() -- --add_executable(luajit-buildvm -- vendor/luajit/src/host/buildvm.c -- vendor/luajit/src/host/buildvm_asm.c -- vendor/luajit/src/host/buildvm_peobj.c -- vendor/luajit/src/host/buildvm_lib.c -- vendor/luajit/src/host/buildvm_fold.c -- -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" --) --target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT) --target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen") -- --if(APPLE) -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" -- COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" -- ) --elseif(UNIX) -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" -- COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" -- ) --elseif(MSVC) -- add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj" -- COMMAND luajit-buildvm -m peobj -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj" -- ) --endif() --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" -- COMMAND luajit-buildvm -m ffdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" -- COMMAND luajit-buildvm -m bcdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" -- COMMAND luajit-buildvm -m folddef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" lj_opt_fold.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" -- COMMAND luajit-buildvm -m recdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" -- COMMAND luajit-buildvm -m libdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) --add_custom_command( -- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" -- COMMAND luajit-buildvm -m vmdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c -- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src --) -- --add_library(luajit STATIC -- vendor/luajit/src/lib_base.c -- vendor/luajit/src/lib_math.c -- vendor/luajit/src/lib_bit.c -- vendor/luajit/src/lib_string.c -- vendor/luajit/src/lib_table.c -- vendor/luajit/src/lib_io.c -- vendor/luajit/src/lib_os.c -- vendor/luajit/src/lib_package.c -- vendor/luajit/src/lib_debug.c -- vendor/luajit/src/lib_jit.c -- vendor/luajit/src/lib_ffi.c -- vendor/luajit/src/lj_gc.c -- vendor/luajit/src/lj_err.c -- vendor/luajit/src/lj_char.c -- vendor/luajit/src/lj_bc.c -- vendor/luajit/src/lj_obj.c -- vendor/luajit/src/lj_buf.c -- vendor/luajit/src/lj_str.c -- vendor/luajit/src/lj_tab.c -- vendor/luajit/src/lj_func.c -- vendor/luajit/src/lj_udata.c -- vendor/luajit/src/lj_meta.c -- vendor/luajit/src/lj_debug.c -- vendor/luajit/src/lj_state.c -- vendor/luajit/src/lj_dispatch.c -- vendor/luajit/src/lj_vmevent.c -- vendor/luajit/src/lj_vmmath.c -- vendor/luajit/src/lj_strscan.c -- vendor/luajit/src/lj_strfmt.c -- vendor/luajit/src/lj_strfmt_num.c -- vendor/luajit/src/lj_api.c -- vendor/luajit/src/lj_profile.c -- vendor/luajit/src/lj_lex.c -- vendor/luajit/src/lj_parse.c -- vendor/luajit/src/lj_bcread.c -- vendor/luajit/src/lj_bcwrite.c -- vendor/luajit/src/lj_load.c -- vendor/luajit/src/lj_ir.c -- vendor/luajit/src/lj_opt_mem.c -- vendor/luajit/src/lj_opt_fold.c -- vendor/luajit/src/lj_opt_narrow.c -- vendor/luajit/src/lj_opt_dce.c -- vendor/luajit/src/lj_opt_loop.c -- vendor/luajit/src/lj_opt_split.c -- vendor/luajit/src/lj_opt_sink.c -- vendor/luajit/src/lj_mcode.c -- vendor/luajit/src/lj_snap.c -- vendor/luajit/src/lj_record.c -- vendor/luajit/src/lj_crecord.c -- vendor/luajit/src/lj_ffrecord.c -- vendor/luajit/src/lj_asm.c -- vendor/luajit/src/lj_trace.c -- vendor/luajit/src/lj_gdbjit.c -- vendor/luajit/src/lj_ctype.c -- vendor/luajit/src/lj_cdata.c -- vendor/luajit/src/lj_cconv.c -- vendor/luajit/src/lj_ccall.c -- vendor/luajit/src/lj_ccallback.c -- vendor/luajit/src/lj_carith.c -- vendor/luajit/src/lj_clib.c -- vendor/luajit/src/lj_cparse.c -- vendor/luajit/src/lj_lib.c -- vendor/luajit/src/lj_alloc.c -- vendor/luajit/src/lib_aux.c -- vendor/luajit/src/lib_init.c -- -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" -- "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" -- # "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" --) --target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_LUA52COMPAT) --target_include_directories(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" PUBLIC "vendor/luajit/src") --if(WIN32) -- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj") --else() -- enable_language(ASM) -- target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s") -- target_link_libraries(luajit ${CMAKE_DL_LIBS}) --endif() --if(APPLE) -- if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") -- target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64) -- target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64) -- endif() --endif() -- - add_subdirectory(vendor/luabins) - - ## libaegisub -@@ -310,18 +106,18 @@ if(APPLE) - else() - target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h") - endif() --target_link_libraries(libaegisub PRIVATE luajit luabins) -+target_link_libraries(libaegisub PRIVATE luajit-5.1 luabins) - - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.h" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config_platform.json" -- COMMAND luajit-minilua "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h -+ COMMAND luajit "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc" - ) - - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" -- COMMAND luajit-minilua ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" -+ COMMAND luajit ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h" - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps - ) - -@@ -496,7 +292,7 @@ add_executable(Aegisub WIN32 - src/video_slider.cpp - src/visual_feature.cpp - ) --target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit) -+target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit-5.1) - target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD) - target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc") - if(APPLE) -diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt -index 1fe1d2031..e2761527b 100644 ---- a/vendor/luabins/CMakeLists.txt -+++ b/vendor/luabins/CMakeLists.txt -@@ -36,4 +36,4 @@ add_library(luabins STATIC - src/savebuffer.c - src/write.c - ) --target_link_libraries(luabins PRIVATE luajit) -\ No newline at end of file -+target_link_libraries(luabins PRIVATE luajit-5.1) -\ No newline at end of file diff --git a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch b/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch deleted file mode 100644 index 6bdfcf2c2d2a4..0000000000000 --- a/pkgs/applications/video/anilibria-winmaclinux/0003-build-with-vlc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/AniLibria.pro b/AniLibria.pro -index 407dbde..ae69502 100644 ---- a/AniLibria.pro -+++ b/AniLibria.pro -@@ -21,17 +21,17 @@ windows { - DEFINES += NO_NEED_STANDART_PLAYER - } - --#unix { --# LIBS += -lvlc -+unix { -+ LIBS += -lvlc - - # INCLUDEPATH += /usr/include/ - # DEPENDPATH += /usr/include/ - --# INCLUDEPATH += /usr/include/vlc/plugins --# DEPENDPATH += /usr/include/vlc/plugins -+ INCLUDEPATH += @VLC_PATH@/vlc/plugins -+ DEPENDPATH += @VLC_PATH@/vlc/plugins - --# CONFIG += buildwithvlc --#} -+ CONFIG += buildwithvlc -+} - - buildwithvlc { - DEFINES += USE_VLC_PLAYER diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index d35947be850b1..818e3a8e15053 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -11,23 +11,27 @@ , wrapQtAppsHook , makeDesktopItem , copyDesktopItems -, libvlc + +, withVLC ? true , libvlc +, withMPV ? true , mpv-unwrapped }: mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.15"; + version = "1.2.16.2"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - sha256 = "sha256-pfM3o4H3XJ4ZE0FXVR1k8pc7lr7SOQjKEMWuG9YkvvI="; + hash = "sha256-IgNYJSadGemjclh7rtY8dHz7uSfBHoWEyLlRoZ+st6k="; }; sourceRoot = "${src.name}/src"; - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=unixvlc" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ] + ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ]; patches = [ ./0001-fix-installation-paths.patch @@ -61,14 +65,15 @@ mkDerivation rec { qtquickcontrols2 qtwebsockets qtmultimedia - libvlc ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-good gst-plugins-base gst-libav gstreamer - ]); + ]) + ++ lib.optionals withVLC [ libvlc ] + ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; desktopItems = [ (makeDesktopItem (rec { diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index 72c4f7bdbf3f2..e460a9037da45 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.0-2"; + version = "1.13.2-1"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-svTD8YZBFj0K9/3ggojiH+8cMRkCxHr/hHTC24NL2tE="; + hash = "sha256-yqgQNsTD4iT54LJYEbV6dk7OD7KoZvX61XERYQ4MsSA="; }; unpackPhase = '' diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 972a68e04f03f..6bad50d9e453e 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "unstable-2023-01-29"; + version = "2.3-unstable-2024-03-20"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89"; - sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q"; + rev = "18a693425f78f7c4c68b5a342efce3e8db2a30dc"; + hash = "sha256-+47Xa63GoKiQzEXbxmKUwJLDIFUnzc/FfxRPXCCxzpE="; }; preConfigure = '' @@ -107,7 +107,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Professional video editing and compositing environment (community version)"; homepage = "http://cinelerra-cv.wikidot.com/"; + mainProgram = "cinelerracv"; maintainers = with maintainers; [ marcweber ]; license = licenses.gpl2Only; + # https://github.com/cinelerra-cv-team/cinelerra-cv/issues/3 + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix deleted file mode 100644 index 8bd17d2f785e6..0000000000000 --- a/pkgs/applications/video/corrscope/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, mkDerivationWith -, python3Packages -, fetchFromGitHub -, fetchpatch -, wrapQtAppsHook -, ffmpeg -, qtbase -, testers -, corrscope -}: - -mkDerivationWith python3Packages.buildPythonApplication rec { - pname = "corrscope"; - version = "0.8.1"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "corrscope"; - repo = "corrscope"; - rev = version; - hash = "sha256-pS7upOYZAjgR3lWxny8TNZEj3Rrbg+L90ANZWFO9UPQ="; - }; - - patches = [ - # https://github.com/corrscope/corrscope/pull/446 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/corrscope/corrscope/commit/70b123173a7a012d9f29d6d3a8960b85caf6cc79.patch"; - hash = "sha256-YCtb7v8cGP0pdceAKeoempnRzw+LRKQqDb3AfN0z/9s="; - }) - ]; - - pythonRelaxDeps = [ "attrs" "ruamel.yaml" ]; - - nativeBuildInputs = [ - wrapQtAppsHook - ] ++ (with python3Packages; [ - poetry-core - pythonRelaxDepsHook - ]); - - buildInputs = [ - ffmpeg - qtbase - ]; - - propagatedBuildInputs = with python3Packages; [ - appdirs - appnope - atomicwrites - attrs - click - matplotlib - numpy - packaging - qtpy - pyqt5 - ruamel-yaml - colorspacious - ]; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} - "''${qtWrapperArgs[@]}" - ) - ''; - - passthru.tests.version = testers.testVersion { - package = corrscope; - # Tries writing to - # - $HOME/.local/share/corrscope on Linux - # - $HOME/Library/Application Support/corrscope on Darwin - command = "env HOME=$TMPDIR ${lib.getExe corrscope} --version"; - }; - - meta = with lib; { - description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; - longDescription = '' - Corrscope renders oscilloscope views of WAV files recorded from chiptune (game music from - retro sound chips). - - Corrscope uses "waveform correlation" to track complex waves (including SNES and Sega - Genesis/FM synthesis) which jump around on other oscilloscope programs. - ''; - homepage = "https://github.com/corrscope/corrscope"; - license = licenses.bsd2; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - mainProgram = "corr"; - }; -} diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index e920654869189..7caf12ee76d81 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -31,7 +31,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6.5"; + version = "18.6.6"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -52,8 +52,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-Ua5R0G4okBpz9SyyA2zn6nVflY9AlWch7Kx6PrW/nMg=" - else "sha256-oCK7w5jB7h4PSKg2IJwriyAVi/kj4TurloBcfDAe6BQ="; + then "sha256-9iTdIjHH8uoXlVr6miyqmHuzbbpbqdJPEbPGycsccoI=" + else "sha256-WrIQ1FHm65MOGb5HfFl2WzXYJRlqktuZdrtzcjWp1gI="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -258,7 +258,7 @@ buildFHSEnv { description = "Professional video editing, color, effects and audio post-processing"; homepage = "https://www.blackmagicdesign.com/products/davinciresolve"; license = licenses.unfree; - maintainers = with maintainers; [ jshcmpbll orivej ]; + maintainers = with maintainers; [ amarshall jshcmpbll orivej ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "davinci-resolve"; diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index a1b41d360e45f..f36fb581a5202 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -5,6 +5,7 @@ , pkg-config , makeWrapper , openssl +, configd , Security , mpv , ffmpeg @@ -27,7 +28,8 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ configd Security ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/applications/video/dra-cla/default.nix index 27b745a403d4b..00bf2c642b2d1 100644 --- a/pkgs/applications/video/dra-cla/default.nix +++ b/pkgs/applications/video/dra-cla/default.nix @@ -8,18 +8,19 @@ , mpv , aria2 , ffmpeg +, fzf , openssl }: stdenvNoCC.mkDerivation { pname = "dra-cla"; - version = "unstable-2023-10-10"; + version = "unstable-2024-02-07"; src = fetchFromGitHub { owner = "CoolnsX"; repo = "dra-cla"; - rev = "12e9557fb8dfdff7350e0102a625170bb69acf01"; - hash = "sha256-cGY/FRV2BAS4fzJqIfD7FlIPIS0fCIIBenQYjB2dEsc="; + rev = "cf8a90c0c68338404e8a1434af0a6e65fc5d0a08"; + hash = "sha256-3cz1VeDM0NHdYMiCDVnIq6Y/7rFSijhNrnxC36Yixxc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -30,7 +31,7 @@ stdenvNoCC.mkDerivation { install -Dm755 dra-cla $out/bin/dra-cla wrapProgram $out/bin/dra-cla \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg openssl ]} + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl mpv aria2 ffmpeg fzf openssl ]} runHook postInstall ''; diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 4909fe6fa7865..a0841cda69bf9 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0="; + sha256 = "sha256-Pwq7PDj+MH1wzrUyfva2F2+oELm4Sb1EJPUUCsHYb7k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 004601163190f..4e558d335e03f 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.12.0.2"; + version = "2.14.0.1"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SZ/J03PYeAbqQlNQXdqLSduo/5VjQ7VH4eErJqO3Ua0="; + sha256 = "sha256-kyW/vYKGy/tgHmev8LgJbGugfKkzKFwLZStQQfWYPuQ="; }; buildInputs = [ ffmpeg frei0r sox gtk3 ladspaPlugins - (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) + (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow libusb1 ])) ]; nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 98b486ce26555..9c5d7f2067fee 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.19.2"; + version = "0.20.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-GhlU02CmglHUzVTqoajXFS1E6WXxXjxRTdiDEDqsH8s="; + sha256 = "sha256-7k5hyiK3m+117AxmsoecGsgXSxs8xhyTf8+rl4oBbB8="; }; passthru.tests = nixosTests.freetube; diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 9aee25c46ce55..cf381a5f42658 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -65,6 +65,12 @@ python.pkgs.buildPythonApplication rec { url = "https://github.com/blakeblackshear/frigate/commit/56bdacc1c661eff8a323e033520e75e2ba0a3842.patch"; hash = "sha256-s/goUJxIbjq/woCEOEZECdcZoJDoWc1eM63sd60cxeY="; }) + (fetchpatch2 { + # https://github.com/blakeblackshear/frigate/pull/10967 + name = "frigate-wsdl-path.patch"; + url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch"; + hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU="; + }) ]; postPatch = '' diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 54216cf73ad68..da7170ca5f381 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -26,7 +26,7 @@ , numactl , writeText # Processing, video codecs, containers -, ffmpeg_5-full +, ffmpeg-full , nv-codec-headers , libogg , x264 @@ -69,6 +69,10 @@ # for now we disable GTK GUI support on Darwin. (It may be possible to remove # this restriction later.) , useGtk ? !stdenv.isDarwin +, bzip2 +, desktop-file-utils +, meson +, ninja , wrapGAppsHook , intltool , glib @@ -86,64 +90,70 @@ }: let - version = "1.6.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "sha256-0MJ1inMNA6s8l2S0wnpM2c7FxOoOHxs9u4E/rgKfjJo="; + hash = "sha256-4Q//UU/CPgWvhtpROfNPLzBvZlB02hbFe9Z9FA7mX04="; }; # Handbrake maintains a set of ffmpeg patches. In particular, these # patches are required for subtitle timing to work correctly. See: # https://github.com/HandBrake/HandBrake/issues/4029 - ffmpeg-version = "5.1.2"; - ffmpeg-hb = ffmpeg_5-full.overrideAttrs (old: { + # base ffmpeg version is specified in: + # https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs + ffmpeg-version = "6.1"; + ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { version = ffmpeg-version; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; - hash = "sha256-OaC8yNmFSfFsVwYkZ4JGpqxzbAZs69tAn5UC6RWyLys="; + hash = "sha256-632j3n3TzkiplGq0R6c0a9EaOoXm77jyws5jfn9UdhE="; }; - patches = old.patches or [ ] ++ [ - "${src}/contrib/ffmpeg/A01-qsv-libavfilter-qsvvpp-change-the-output-frame-s-width-a.patch" - "${src}/contrib/ffmpeg/A02-qsv-configure-ensure-enable-libmfx-uses-libmfx-1.x.patch" - "${src}/contrib/ffmpeg/A03-qsv-configure-fix-the-check-for-MFX_CODEC_VP9.patch" - "${src}/contrib/ffmpeg/A04-qsv-remove-mfx-prefix-from-mfx-headers.patch" - "${src}/contrib/ffmpeg/A05-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A06-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A07-qsvenc-support-multi-frame-encode-when-MFX_VERSION-2.patch" - "${src}/contrib/ffmpeg/A08-qsvenc-support-MFX_RATECONTROL_LA_EXT-when-MFX_VERSI.patch" - "${src}/contrib/ffmpeg/A09-qsv-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" - "${src}/contrib/ffmpeg/A10-qsv-configure-add-enable-libvpl-option.patch" - "${src}/contrib/ffmpeg/A11-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" - "${src}/contrib/ffmpeg/A12-qsv-fix-decode-10bit-hdr.patch" - "${src}/contrib/ffmpeg/A13-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A14-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A15-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A16-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A17-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A18-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A19-ccaption_dec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A20-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A21-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A22-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A23-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A24-fix-eac3-dowmix.patch" - "${src}/contrib/ffmpeg/A25-enable-truehd-pass.patch" - "${src}/contrib/ffmpeg/A26-Update-the-min-version-to-1.4.23.0-for-AMF-SDK.patch" - "${src}/contrib/ffmpeg/A27-avcodec-amfenc-Fixes-the-color-information-in-the-ou.patch" - "${src}/contrib/ffmpeg/A28-avcodec-amfenc-HDR-metadata.patch" - # This patch is not applying since ffmpeg 5.1.1, probably it was backported by upstream - # "${src}/contrib/ffmpeg/A30-svt-av1-backports.patch" - (fetchpatch { - name = "vulkan-remove-extensions.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/eb0455d64690"; - hash = "sha256-qvLrb7b+9/bel8A2lZuSmBiJtHXsABw0Lvgn1ggnmCU="; - }) + patches = (old.patches or [ ]) ++ [ + "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A08-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A09-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A10-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A11-amfenc-Fixes-the-color-information-in-the-ou.patch" + "${src}/contrib/ffmpeg/A12-amfenc-HDR-metadata.patch" + "${src}/contrib/ffmpeg/A13-libavcodec-amfenc-Fix-issue-with-missing-headers-in-.patch" + "${src}/contrib/ffmpeg/A14-avcodec-add-ambient-viewing-environment-packet-side-.patch" + "${src}/contrib/ffmpeg/A15-avformat-mov-add-support-for-amve-ambient-viewing-en.patch" + "${src}/contrib/ffmpeg/A16-videotoolbox-dec-h264.patch" + + # patch to fix <https://github.com/HandBrake/HandBrake/issues/5011> + # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. + # "${src}/contrib/ffmpeg/A17-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" + + "${src}/contrib/ffmpeg/A18-qsv-fix-decode-10bit-hdr.patch" + "${src}/contrib/ffmpeg/A19-ffbuild-common-use-gzip-n-flag-for-cuda.patch" ]; }); + x265-hb = x265.overrideAttrs (old: { + # nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches + # are written with respect to the parent directory instead of that source directory. + # patches which don't cleanly apply are commented out. + postPatch = (old.postPatch or "") + '' + pushd .. + # patch -p1 < ${src}/contrib/x265/A00-crosscompile-fix.patch + patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch + patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch + patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch + patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch + # patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch + popd + ''; + }); + versionFile = writeText "version.txt" '' BRANCH=${versions.majorMinor version}.x DATE=1970-01-01 00:00:01 +0000 @@ -189,6 +199,17 @@ let # Use the Nix-provided libxml2 instead of the system-provided one. substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + '' + optionalString useGtk '' + substituteInPlace gtk/module.rules \ + --replace-fail '$(MESON.exe)' 'meson' \ + --replace-fail '$(NINJA.exe)' 'ninja' \ + # Force using nixpkgs dependencies + substituteInPlace gtk/meson.build \ + --replace-fail "cc.find_library('bz2', dirs: hb_libdirs)" "cc.find_library('bz2')" \ + --replace-fail "cc.find_library('mp3lame', dirs: hb_libdirs)" "cc.find_library('mp3lame')" \ + --replace-fail \ + "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \ + "hb_incdirs = include_directories(hb_dir / 'libhb')" \ ''; nativeBuildInputs = [ @@ -199,7 +220,7 @@ let pkg-config python3 ] - ++ optionals useGtk [ intltool wrapGAppsHook ]; + ++ optionals useGtk [ desktop-file-utils intltool meson ninja wrapGAppsHook ]; buildInputs = [ a52dec @@ -228,12 +249,13 @@ let speex svt-av1 x264 - x265 + x265-hb xz zimg ] ++ optional (!stdenv.isDarwin) numactl ++ optionals useGtk [ + bzip2 dbus-glib glib gst_all_1.gst-plugins-base @@ -254,7 +276,6 @@ let configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - "--disable-gtk-update-checks" ] ++ optional (!useGtk) "--disable-gtk" ++ optional useFdk "--enable-fdk-aac" @@ -264,10 +285,19 @@ let # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; + # meson/ninja are used only for the subprojects, not the toplevel + dontUseMesonConfigure = true; + dontUseMesonInstall = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + makeFlags = [ "--directory=build" ]; - passthru.tests = { - basic-conversion = + passthru = { + # for convenience + inherit ffmpeg-hb x265-hb; + + tests.basic-conversion = let # Big Buck Bunny example, licensed under CC Attribution 3.0. testMkv = fetchurl { @@ -283,7 +313,8 @@ let HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 test -e test.mkv ''; - version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; + + tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; }; meta = with lib; { @@ -300,7 +331,7 @@ let license = licenses.gpl2Only; maintainers = with maintainers; [ Anton-Latukha wmertens ]; platforms = with platforms; unix; - broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 }; }; in diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 7e6cef757cd88..14b0ca9497bc5 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,8 +1,8 @@ { lib , fetchFromGitLab -, mkDerivation +, mkKdeDerivation , breeze-icons -, breeze-qt5 +, breeze , cmake , extra-cmake-modules , ffmpeg-headless @@ -12,7 +12,7 @@ , ki18n , kiconthemes , kio -, kirigami2 +, kirigami , kxmlgui , kdoctools , mpv @@ -20,19 +20,18 @@ , wrapQtAppsHook , qqc2-desktop-style , qtbase -, qtquickcontrols2 , yt-dlp }: -mkDerivation rec { +mkKdeDerivation rec { pname = "haruna"; - version = "0.12.3"; + version = "1.0.2"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-iYf8oTMQ65+6E1dlOj0GU6EezPul6p1GG2CcrcjDUik="; + hash = "sha256-L/mTFPJPHl8A6FqkWUwICh+Yl4uIE5KnTkZVnC4kCZ8="; domain = "invent.kde.org"; }; @@ -43,7 +42,7 @@ mkDerivation rec { buildInputs = [ breeze-icons - breeze-qt5 + breeze qqc2-desktop-style yt-dlp @@ -54,12 +53,11 @@ mkDerivation rec { ki18n kiconthemes kio - kirigami2 + kirigami kxmlgui kdoctools mpv qtbase - qtquickcontrols2 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix index abcdefaf02dd6..f3b363dca0f8b 100644 --- a/pkgs/applications/video/kodi/addons/addon-update-script/default.nix +++ b/pkgs/applications/video/kodi/addons/addon-update-script/default.nix @@ -9,7 +9,7 @@ { attrPath }: let - url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz"; + url = "http://mirrors.kodi.tv/addons/omega/addons.xml.gz"; updateScript = writeShellScript "update.sh" '' set -ex diff --git a/pkgs/applications/video/kodi/addons/arrow/default.nix b/pkgs/applications/video/kodi/addons/arrow/default.nix index 363b41035e000..2515ce7853fca 100644 --- a/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: buildKodiAddon rec { pname = "arrow"; namespace = "script.module.arrow"; version = "1.2.3"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.module.arrow/script.module.arrow-${version}.zip"; sha256 = "sha256-Et+9FJT1dRE1dFOrAQ70HJJcfylyLsiyay9wPJcSOXs="; }; diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 287735d246e76..8311a50680213 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: buildKodiAddon rec { pname = "arteplussept"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.4.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; hash = "sha256-dqxGKaOnEYOI33Aw76zbjma5z7MqOUh367dFsV87olU="; }; diff --git a/pkgs/applications/video/kodi/addons/certifi/default.nix b/pkgs/applications/video/kodi/addons/certifi/default.nix index 13ed0c1e4585b..ecab49746a27e 100644 --- a/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; version = "2023.5.7"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NQbjx+k9fnQMYLLMR5+N5NSuDcXEzZjlhGPA3qSmjfI="; }; diff --git a/pkgs/applications/video/kodi/addons/chardet/default.nix b/pkgs/applications/video/kodi/addons/chardet/default.nix index 5d3fd8421db96..8d385e717b8a4 100644 --- a/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "chardet"; namespace = "script.module.chardet"; version = "5.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-cIQIX6LVAoGf1sBRKWonXJd3XYqGOa5WIUttabV0HeU="; }; diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 30b54c2adae2e..cfaef2bb7f98e 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -14,6 +14,8 @@ let postPatch = '' # remove addons already included in the base kodi package rm -r addons/game.controller.default + rm -r addons/game.controller.keyboard + rm -r addons/game.controller.mouse rm -r addons/game.controller.snes ''; diff --git a/pkgs/applications/video/kodi/addons/dateutil/default.nix b/pkgs/applications/video/kodi/addons/dateutil/default.nix index 9adcf3303bb5c..b0fadcf8a8622 100644 --- a/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "dateutil"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.8.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; }; diff --git a/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 12a9f82e3f6e2..1c6a844e0a30a 100644 --- a/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "defusedxml"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.6.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg="; }; diff --git a/pkgs/applications/video/kodi/addons/future/default.nix b/pkgs/applications/video/kodi/addons/future/default.nix index c8078ff36d5aa..8812fbd8f5b39 100644 --- a/pkgs/applications/video/kodi/addons/future/default.nix +++ b/pkgs/applications/video/kodi/addons/future/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "future"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.18.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ="; }; diff --git a/pkgs/applications/video/kodi/addons/idna/default.nix b/pkgs/applications/video/kodi/addons/idna/default.nix index d752cb93b01ad..76a6e81b00728 100644 --- a/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/pkgs/applications/video/kodi/addons/idna/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; version = "3.4.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 49afbf8507b19..677467d343965 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }: +{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest }: let bento4 = fetchFromGitHub { owner = "xbmc"; repo = "Bento4"; - rev = "1.6.0-639-7-Omega"; - sha256 = "sha256-d3znV88dLMbA4oUWsTZ7vS6WHOWzN7lIHgWPkR5Aixo="; + rev = "1.6.0-641-${rel}"; + sha256 = "sha256-vsFMDzH8JJecYw0qWKGCxnd/m5wn62mCKE2g2HwQhwI="; }; in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.16"; + version = "21.4.4"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-1OY+3pvpVW8rkj7HL84IECyHpAmWsUQ9mTzuGesH+jI="; + sha256 = "sha256-Nzlm1AW/nW9chQAourKF0o2FSQmsr1MNhJ4gEO0/9sM="; }; extraCMakeFlags = [ @@ -26,7 +26,7 @@ buildKodiBinaryAddon rec { extraNativeBuildInputs = [ gtest ]; - extraBuildInputs = [ expat ]; + extraBuildInputs = [ pugixml ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index fc32568559179..ffb0a0cf83a76 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "unstable-20.5.0"; + version = "21.3.5"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; - rev = rel; - sha256 = "sha256-+u28Wzp2TonL5jaa5WJUr9igR6KiaxizZAX9jqqBUns="; + rev = "${version}-${rel}"; + sha256 = "sha256-pPufkDPHq5EsvC6YTsRX9TjqjIczOL/6Vc5HGDIe9Gk="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index 561ef2cc5577a..960c50ce09e7d 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "20.3.0"; + version = "21.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4="; + sha256 = "sha256-M6LFokWQRzBZ7inzRsMxyWzkV0XsGHh4d0CPhv1NCfI="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index ceafe3b9c5ff5..97cc417e6bf1c 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; version = "0.6.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index e5d26ef4a64c3..36ae8608837d2 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.2.6"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o="; }; diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix new file mode 100644 index 0000000000000..88e9504f8d191 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -0,0 +1,55 @@ +{ 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 = "jellycon"; + namespace = "plugin.video.jellycon"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "jellyfin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-60my7Y60KV5WWALQiamnmAJZJi82cV21rIGYPiV7T+A="; + }; + + nativeBuildInputs = [ + python + ]; + + prePatch = '' + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + substituteInPlace build.py \ + --replace "with zipfile.ZipFile(f'{target}/{archive_name}', 'w') as z:" "with zipfile.ZipFile(f'{target}/{archive_name}', 'w', strict_timestamps=False) as z:" + ''; + + buildPhase = '' + ${python}/bin/python3 build.py --version=py3 + ''; + + postInstall = '' + mv /build/source/addon.xml $out${addonDir}/${namespace}/ + ''; + + propagatedBuildInputs = [ + requests + dateutil + six + kodi-six + signals + websocket + ]; + + meta = with lib; { + homepage = "https://github.com/jellyfin/jellycon"; + description = "A lightweight Kodi add-on for Jellyfin"; + longDescription = '' + JellyCon is a lightweight Kodi add-on that lets you browse and play media + files directly from your Jellyfin server within the Kodi interface. It can + easily switch between multiple user accounts at will. + ''; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 1e570ab511313..63cac3e7261cf 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.12"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-m8msTBim4Ss8XaYqIn6GWXxoCio5ABbqhhgyb1T/Yhg="; + sha256 = "sha256-i9lRPMHniUmKTeNSzgp6dF11uYOcjH3PgJEa+Jasx68="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index ff710cdedef3d..154bbd6b3c1e5 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.1.5"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-wSztipTEGIqw1icsz+ziNxYuRZOFt3C66T1Ifap/ta0="; }; diff --git a/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 638b7c3b500b8..a9c7547aa3715 100644 --- a/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "kodi-six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.1.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI="; }; diff --git a/pkgs/applications/video/kodi/addons/mediacccde/default.nix b/pkgs/applications/video/kodi/addons/mediacccde/default.nix index 9c09078557edc..a0d334633fe1d 100644 --- a/pkgs/applications/video/kodi/addons/mediacccde/default.nix +++ b/pkgs/applications/video/kodi/addons/mediacccde/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: buildKodiAddon rec { pname = "media.ccc.de"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.3.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; hash = "sha256-T8J2HtPVDfaPU0gZEa0xVBzwjNInxkRFCCSxS53QhmU="; }; diff --git a/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/pkgs/applications/video/kodi/addons/myconnpy/default.nix index dac308ab5837d..a162e844ed55d 100644 --- a/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "myconnpy"; namespace = "script.module.myconnpy"; version = "8.0.33"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NlLMq9RAdWu8rVsMc0FDe1HmQiVp5T7iBXbIH7HB5bI="; }; diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 2bff3b6d19b31..3b3aa97d53432 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - hash = "sha256-/wHKwFZbuxK0iwlqvZpyfi0lnRkjm/HSn221IgCN7VQ="; + hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 901d1d65716c5..71e0e1744b787 100644 --- a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -17,5 +17,7 @@ buildKodiAddon rec { platforms = platforms.all; maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; + + broken = true; # no release for kodi 21 }; } diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index bb556e9ec8226..45e0e845acb74 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "radioparadise"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.radioparadise/script.radioparadise-${version}.zip"; sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; }; diff --git a/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/pkgs/applications/video/kodi/addons/requests-cache/default.nix index 6800ecde832ad..3a71019d9ccbd 100644 --- a/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "requests-cache"; namespace = "script.module.requests-cache"; version = "0.5.2+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk="; }; diff --git a/pkgs/applications/video/kodi/addons/requests/default.nix b/pkgs/applications/video/kodi/addons/requests/default.nix index e21dac1ef3a05..4950d63608eb3 100644 --- a/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/pkgs/applications/video/kodi/addons/requests/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: buildKodiAddon rec { pname = "requests"; namespace = "script.module.requests"; version = "2.31.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-05BSD5aoN2CTnjqaSKYMb93j5nIfLvpJHyeQsK++sTw="; }; diff --git a/pkgs/applications/video/kodi/addons/routing/default.nix b/pkgs/applications/video/kodi/addons/routing/default.nix index a96c16b8629c2..9c87c69e9912e 100644 --- a/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/pkgs/applications/video/kodi/addons/routing/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "routing"; namespace = "script.module.routing"; version = "0.2.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I="; }; diff --git a/pkgs/applications/video/kodi/addons/signals/default.nix b/pkgs/applications/video/kodi/addons/signals/default.nix index 4d84bcafeeef2..9f7496f3c4ca8 100644 --- a/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/pkgs/applications/video/kodi/addons/signals/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "signals"; namespace = "script.module.addon.signals"; version = "0.0.6+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE="; }; diff --git a/pkgs/applications/video/kodi/addons/simplejson/default.nix b/pkgs/applications/video/kodi/addons/simplejson/default.nix index b0a04402d3b15..2889e38e960f1 100644 --- a/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "simplejson"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "3.19.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-RJy75WAr0XmXnSrPjqKhFjWJnWo3c5IEtUGumcE/mRo="; }; diff --git a/pkgs/applications/video/kodi/addons/six/default.nix b/pkgs/applications/video/kodi/addons/six/default.nix index 5ce4817eae3bd..80bbefe39a113 100644 --- a/pkgs/applications/video/kodi/addons/six/default.nix +++ b/pkgs/applications/video/kodi/addons/six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.16.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno="; }; diff --git a/pkgs/applications/video/kodi/addons/somafm/default.nix b/pkgs/applications/video/kodi/addons/somafm/default.nix index 4ffc69791298b..e2d5ca38bf443 100644 --- a/pkgs/applications/video/kodi/addons/somafm/default.nix +++ b/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "somafm"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; sha256 = "sha256-auPLm7QFabU4tXJPjTl17KpE+lqWM2Edbd2HrXPRx40="; }; diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix index 7cc94bc435a51..8c12ac47ca3fc 100644 --- a/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix @@ -23,5 +23,7 @@ buildKodiAddon rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = teams.kodi.members; + + broken = true; # no release for kodi 21 }; } diff --git a/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/pkgs/applications/video/kodi/addons/trakt-module/default.nix index 1c9680147cb52..37816f89e3630 100644 --- a/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: buildKodiAddon rec { pname = "trakt-module"; namespace = "script.module.trakt"; version = "4.4.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY="; }; diff --git a/pkgs/applications/video/kodi/addons/trakt/default.nix b/pkgs/applications/video/kodi/addons/trakt/default.nix index 64113cb0139ba..bf360072becc4 100644 --- a/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -1,12 +1,12 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: buildKodiAddon rec { pname = "trakt"; namespace = "script.trakt"; - version = "3.5.0"; + version = "3.6.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-OyU6S5r/y3vqW6Wg6OP0+Zn4YchBy8x1i++hzCQHyx0="; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index fd52528b7ca01..d2fc31c99bcd2 100644 --- a/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "typing_extensions"; namespace = "script.module.typing_extensions"; version = "4.7.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-bCGPl5fGVyptCenpNXP/Msi7hu+UdtZd2ms7MfzbsbM="; }; diff --git a/pkgs/applications/video/kodi/addons/urllib3/default.nix b/pkgs/applications/video/kodi/addons/urllib3/default.nix index 8d13052b950ea..9cfc54797e875 100644 --- a/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "urllib3"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; }; diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index c2bbe9de09b68..6d0ecc55aa05a 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: buildKodiAddon rec { pname = "websocket"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.6.4"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE="; }; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 83afc51053ba8..d98acd70ac5c4 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.3.2"; + version = "7.0.5"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-gJ7RGB0pSG/iLdpmXHpQOoQTisXnMl1Mgd0KYFgg2qI="; + hash = "sha256-oM1n0Rye2QagxXoAZ/6mXKeGqKjEdewgS79lhp+yCQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 3f382efff11b9..b028558a61da7 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,14 +1,18 @@ { callPackage, ... } @ args: let unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]); - kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; }; in unwrapped.overrideAttrs (oldAttrs: { - passthru = oldAttrs.passthru // { - packages = kodiPackages; - withPackages = func: callPackage ./wrapper.nix { - kodi = unwrapped; - addons = kodiPackages.requiredKodiAddons (func kodiPackages); - }; - }; + passthru = + let + finalKodi = oldAttrs.passthru.kodi; + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; }; + in + oldAttrs.passthru // { + packages = kodiPackages; + withPackages = func: callPackage ./wrapper.nix { + kodi = finalKodi; + addons = kodiPackages.requiredKodiAddons (func kodiPackages); + }; + }; }) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index f97b53b60937b..e8e5b5844f1f4 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchFromGitHub -, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless , gtest, ncurses, spdlog , libxml2, systemd -, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl +, alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -29,11 +28,12 @@ , rtmpSupport ? true, rtmpdump , sambaSupport ? true, samba , udevSupport ? true, udev +, opticalSupport ? true , usbSupport ? false, libusb-compat-0_1 , vdpauSupport ? true, libvdpau , waylandSupport ? false, wayland, wayland-protocols , waylandpp ? null, libxkbcommon -, gbmSupport ? false, mesa, libinput +, gbmSupport ? false, mesa, libinput, libdisplay-info , buildPackages }: @@ -41,54 +41,8 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240302"; - kodiVersion = "20.5"; - rel = "Nexus"; - - kodi_src = fetchFromGitHub { - owner = "xbmc"; - repo = "xbmc"; - rev = "${kodiVersion}-${rel}"; - hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; - }; - # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies - # kodi 20.0 moved to ffmpeg 5, *but* there is a bug making the compilation fail which will - # only been fixed in kodi 21, so stick to ffmpeg 4 for now - ffmpeg = stdenv.mkDerivation rec { - pname = "kodi-ffmpeg"; - version = "4.4.1"; - src = fetchFromGitHub { - owner = "xbmc"; - repo = "FFmpeg"; - rev = "${version}-${rel}-Alpha1"; - sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; - }; - patches = [ - # Backport fix for binutils-2.41. - (fetchpatch { - name = "binutils-2.41.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; - hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; - }) - ]; - preConfigure = '' - cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . - sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt - sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt - ''; - cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCROSSCOMPILING=ON" - "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" - "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkg-config" - ]; - buildInputs = [ libidn2 libtasn1 p11-kit zlib libva ] - ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; - }; - # We can build these externally but FindLibDvd.cmake forces us to build it # them, so we currently just use them for the src. libdvdcss = fetchFromGitHub { @@ -112,21 +66,48 @@ let sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc="; }; + groovy = fetchzip { + url = "mirror://apache/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip"; + sha256 = "sha256-OfZBiMVrhw6VqHRHCSC7ZV3FiZ26n4+F8hsskk+L6yU="; + }; + + apache_commons_lang = fetchzip { + url = "mirror://apache/commons/lang/binaries/commons-lang3-3.14.0-bin.zip"; + sha512 = "sha512-eKF1IQ6PDtifb4pMHWQ2SYHIh0HbMi3qpc92lfbOo3uSsFJVR3n7JD0AdzrG17tLJQA4z5PGDhwyYw0rLeLsXw=="; + }; + + apache_commons_text = fetchzip { + url = "mirror://apache/commons/text/binaries/commons-text-1.11.0-bin.zip"; + sha512 = "sha512-P2IvnrHSYRF70LllTMI8aev43h2oe8lq6rrMYw450PEhEa7OuuCjh1Krnc/A4OqENUcidVAAX5dK1RAsZHh8Dg=="; + }; + kodi_platforms = lib.optional gbmSupport "gbm" ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "kodi"; - version = kodiVersion; + version = "21.0"; + kodiReleaseName = "Omega"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "xbmc"; + rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}"; + hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; + }; + + # make derivations declared in the let binding available here, so + # they can be overridden + inherit libdvdcss libdvdnav libdvdread groovy + apache_commons_lang apache_commons_text; - src = kodi_src; buildInputs = [ gnutls libidn2 libtasn1 nasm p11-kit libxml2 python3Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh + openssl gperf tinyxml2 tinyxml-2 taglib libssh gtest ncurses spdlog alsa-lib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff @@ -168,6 +149,7 @@ in stdenv.mkDerivation { libxkbcommon.dev mesa.dev libinput.dev + libdisplay-info ]; nativeBuildInputs = [ @@ -189,14 +171,20 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}" - "-Dlibdvdcss_URL=${libdvdcss}" - "-Dlibdvdnav_URL=${libdvdnav}" - "-Dlibdvdread_URL=${libdvdread}" - "-DGIT_VERSION=${kodiReleaseDate}" + "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}" + "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}" + "-Dlibdvdread_URL=${finalAttrs.libdvdread}" + "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}" + "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}" + "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}" + # Upstream derives this from the git HEADs hash and date. + # LibreElec (minimal distro for kodi) uses the equivalent to this. + "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}" "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_INTERNAL_RapidJSON=OFF" - "-DENABLE_OPTICAL=ON" + "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}" + "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}" "-DLIRC_DEVICE=/run/lirc/lircd" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" @@ -239,7 +227,8 @@ in stdenv.mkDerivation { --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - ([ curl systemd libmad libvdpau libcec libcec_platform libass ] + ([ curl systemd libmad libcec libcec_platform libass ] + ++ lib.optional vdpauSupport libvdpau ++ lib.optional nfsSupport libnfs ++ lib.optional rtmpSupport rtmpdump)}" done @@ -258,6 +247,7 @@ in stdenv.mkDerivation { passthru = { pythonPackages = python3Packages; ffmpeg = ffmpeg; + kodi = finalAttrs.finalPackage; }; meta = with lib; { @@ -267,4 +257,4 @@ in stdenv.mkDerivation { platforms = platforms.linux; maintainers = teams.kodi.members; }; -} +}) diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 5fe8c8785a818..ebab149ab1a89 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -13,6 +13,7 @@ let license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; mainProgram = "losslesscut"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 2768dadad8265..57186eec19f8c 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -47,14 +47,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; pyproject = true; - version = "0.18.0"; + version = "0.18.0.post0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; rev = "refs/tags/v${version}"; - hash = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM="; + hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; }; nativeBuildInputs = with python.pkgs; [ @@ -64,8 +64,10 @@ in python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "cloup" + "isosurfaces" "pillow" "skia-pathops" + "watchdog" ]; patches = [ diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/applications/video/manim/failing_tests.nix index 1bffaf6e74052..ac788c25be20c 100644 --- a/pkgs/applications/video/manim/failing_tests.nix +++ b/pkgs/applications/video/manim/failing_tests.nix @@ -64,6 +64,21 @@ "test_PointCloudDot" "test_Torus" + # test_ImplicitFunction[/test_implicit_graph] failing with: + # E AssertionError: + # E Not equal to tolerance rtol=1e-07, atol=1.01 + # E Frame no -1. You can use --show_diff to visually show the difference. + # E Mismatched elements: 1185[/633] / 1639680[/1639680] (0.0723[/0.0386]%) + # E Max absolute difference: 125[/121] + # E Max relative difference: 6.5[/1] + # + # These started failing after relaxing the “watchdog” and “isosurfaces” dependencies, + # likely due to a tolerance difference. They should, however, start working again when [1] is + # included in a Manim release. + # [1]: https://github.com/ManimCommunity/manim/pull/3376 + "test_ImplicitFunction" + "test_implicit_graph" + # failing with: # TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? "test_force_window_opengl_render_with_movies" diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 8a9f287c0c212..761243d897ba0 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-/W0SkKe9rcwf8HBIEcdJCPdZEnx9eh+twBu9wa6Sq30="; + hash = "sha256-n+eQjjjdZhvXFSw5D/UQhyBMSZstfI/JixiEVhmQwXs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index e3bd3cbf99a26..72e53090d33c7 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "mlv-app"; - version = "1.11"; + version = "1.14"; src = fetchFromGitHub { owner = "ilia3101"; repo = "MLV-App"; rev = "QTv${version}"; - sha256 = "0s5sjdxi8a17ddvih4ara7mlb2xrc9xqx52jmhfaca6ng341gi4x"; + sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 880ea831f1864..0fbfefa271988 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -176,6 +176,9 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; + # Fixes compilation with newer versions of clang that make these warnings errors by default. + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion -Wno-incompatible-function-pointer-types"; + NIX_LDFLAGS = with lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 68ccc3b139d15..fac7c910d57ad 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -67,9 +67,13 @@ let chapterskip = callPackage ./chapterskip.nix { }; convert = callPackage ./convert.nix { }; cutter = callPackage ./cutter.nix { }; + dynamic-crop = callPackage ./dynamic-crop.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; + modernx = callPackage ./modernx.nix { }; + modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix new file mode 100644 index 0000000000000..f2cd7dc070166 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, unstableGitUpdater +, buildLua +}: +buildLua { + pname = "dynamic-crop"; + + version = "0-unstable-2023-12-22"; + src = fetchFromGitHub { + owner = "Ashyni"; + repo = "mpv-scripts"; + rev = "c79a46ba03631eb2a9b4f598aab0b723f03fc531"; + hash = "sha256-W4Dj2tyJHeHLqAndrzllKs4iwMe3Tu8rfzEGBHuke6s="; + }; + passthru.scriptName = "dynamic-crop.lua"; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = ''Script to "cropping" dynamically, hard-coded black bars detected with lavfi-cropdetect filter for Ultra Wide Screen or any screen (Smartphone/Tablet).''; + homepage = "https://github.com/Ashyni/mpv-scripts"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.iynaix ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix new file mode 100644 index 0000000000000..36b20fe11205c --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, makeFontsConf +, nix-update-script +}: +buildLua (finalAttrs: { + pname = "modernx-zydezu"; + version = "0.2.9"; + + scriptPath = "modernx.lua"; + src = fetchFromGitHub { + owner = "zydezu"; + repo = "ModernX"; + rev = finalAttrs.version; + hash = "sha256-Tq/v8EbojvOSSwbu8kdbLVxZWZNi1UH6zAPTcsUcgog"; + }; + + postInstall = '' + mkdir -p $out/share/fonts + cp -r *.ttf $out/share/fonts + ''; + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A modern OSC UI replacement for MPV that retains the functionality of the default OSC"; + homepage = "https://github.com/zydezu/ModernX"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ Guanran928 ]; + }; +}) diff --git a/pkgs/applications/video/mpv/scripts/modernx.nix b/pkgs/applications/video/mpv/scripts/modernx.nix new file mode 100644 index 0000000000000..e6e9ec6110c4f --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/modernx.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, makeFontsConf +, nix-update-script +}: +buildLua (finalAttrs: { + pname = "modernx"; + version = "0.6.0"; + + scriptPath = "modernx.lua"; + src = fetchFromGitHub { + owner = "cyl0"; + repo = "ModernX"; + rev = finalAttrs.version; + hash = "sha256-Gpofl529VbmdN7eOThDAsNfNXNkUDDF82Rd+csXGOQg="; + }; + + postInstall = '' + mkdir -p $out/share/fonts + cp -r *.ttf $out/share/fonts + ''; + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "A modern OSC UI replacement for MPV that retains the functionality of the default OSC"; + homepage = "https://github.com/cyl0/ModernX"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ Guanran928 ]; + }; +}) diff --git a/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix b/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix new file mode 100644 index 0000000000000..ce32622d64d8f --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-osc-modern.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, makeFontsConf +, nix-update-script +}: +buildLua (finalAttrs: { + pname = "mpv-osc-modern"; + version = "1.1.1"; + + scriptPath = "modern.lua"; + src = fetchFromGitHub { + owner = "maoiscat"; + repo = "mpv-osc-modern"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RMUy8UpSRSCEPAbnGLpJ2NjDsDdkjq8cNsdGwsQ5ANU="; + }; + + postInstall = '' + mkdir -p $out/share/fonts + cp -r *.ttf $out/share/fonts + ''; + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Another MPV OSC Script"; + homepage = "https://github.com/maoiscat/mpv-osc-modern"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ Guanran928 ]; + }; +}) diff --git a/pkgs/applications/video/mpv/scripts/reload.nix b/pkgs/applications/video/mpv/scripts/reload.nix index 6f316e2f5d42a..ec9f441f7cfba 100644 --- a/pkgs/applications/video/mpv/scripts/reload.nix +++ b/pkgs/applications/video/mpv/scripts/reload.nix @@ -6,12 +6,12 @@ buildLua rec { pname = "mpv-reload"; - version = "unstable-2023-12-19"; + version = "unstable-2024-03-22"; src = fetchFromGitHub { owner = "4e6"; repo = pname; - rev = "133d596f6d369f320b4595bbed1f4a157b7b9ee5"; - hash = "sha256-B+4TCmf1T7MuwtbL+hGZoN1ktI31hnO5yayMG1zW8Ng="; + rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; + hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0="; }; passthru.updateScript = unstableGitUpdater {}; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix index 841fc8eb9b4fb..7ea503ddd62c5 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -1,9 +1,4 @@ -{ lib -, buildLua -, fetchFromGitea -, unstableGitUpdater -, curl -}: +{ lib, buildLua, fetchFromGitea, unstableGitUpdater, curl, coreutils }: buildLua { pname = "mpv_sponsorblock_minimal"; @@ -17,15 +12,17 @@ buildLua { rev = "ca2844b8cf7674bfccd282d389a50427742251d3"; hash = "sha256-28HWZ6nOhKiE+5Ya1N3Vscd8aeH9OKS0t72e/xPfFQQ="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { }; preInstall = '' substituteInPlace sponsorblock_minimal.lua \ - --replace "curl" "${lib.getExe curl}" + --replace-fail "curl" "${lib.getExe curl}" \ + --replace-fail "sha256sum" "${lib.getExe' coreutils "sha256sum"}" ''; meta = with lib; { - description = "A minimal script to skip sponsored segments of YouTube videos"; + description = + "A minimal script to skip sponsored segments of YouTube videos"; homepage = "https://codeberg.org/jouni/mpv_sponsorblock_minimal"; license = licenses.gpl3Only; platforms = platforms.all; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index e5bb972a24181..61eb65f9bf9f3 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,14 +9,14 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.1.1"; + version = "5.2.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-+4k8T1yX3IRXK3XkUShsuJSH9w1Zla7CaRENcIqX4iM="; + hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo="; }; passthru.updateScript = gitUpdater {}; @@ -26,15 +26,6 @@ buildLua (finalAttrs: { vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y="; }; - # Patch lua script to get the path to its `ziggy` binary form the environment - patches = [ - # uosc#814: Support overriding `ziggy_path` via environment variable - (fetchpatch { - url = "https://github.com/tomasklaen/uosc/commit/4fdf68a1bcb510824d66f35ecc7672a6452a44b2.patch"; - hash = "sha256-igUqFf8e7LVIIjGxACdIWAeZxjF/yqaCL4QRXrzNQXk="; - }) - ]; - # the script uses custom "texture" fonts as the background for ui elements. # In order for mpv to find them, we need to adjust the fontconfig search path. postInstall = "cp -r src/fonts $out/share"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fee1addf0e6d2..3df52d08684d5 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -62,13 +62,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.1.0"; + version = "30.1.2"; src = fetchFromGitHub { owner = "obsproject"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-9rf3UGazEL5Obd6tqDwM5LOC6D1X6HNzs5sn5z1tOCA="; + sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; fetchSubmodules = true; }; 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 b776981522d0c..ea379e6ffc51f 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 @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.24.2"; + version = "1.25.5"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-J5Qcs2eoKMeO1O/MCsR5wfmfbtndRaZmHrbleEZqqOo="; + hash = "sha256-ROR+R1Zak8XkhFk1+Pyi0lB+JZI4SVtKGin4vem7NEE="; }; nativeBuildInputs = [ @@ -61,11 +61,7 @@ stdenv.mkDerivation rec { chmod -R +w $sourceRoot/deps/libremidi ''; - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - mv $out/data $out/share/obs - ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=stringop-overflow"; meta = with lib; { description = "An automated scene switcher for OBS Studio"; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 419f470fccb12..8926b7e1764b8 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -8,26 +8,35 @@ , xorg , libxkbcommon , libxkbfile +, SDL2 }: stdenv.mkDerivation rec { pname = "obs-input-overlay"; - version = "5.0.0"; + version = "5.0.4"; src = fetchFromGitHub { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-kpVAvQpBU8TxHAFcx/ok67++4MHh5saoRHJc5XpY4YQ="; + sha256 = "sha256-MON68yjHUOF/bggWqhw8D0+23HpKQN3jWs+5lLAacaQ="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - obs-studio libuiohook qtbase + obs-studio libuiohook qtbase SDL2 xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXtst xorg.libXext xorg.libXi xorg.libXt xorg.libXinerama libxkbcommon libxkbfile ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-msse4.1" + ]; + + postUnpack = '' + sed -i '/set(CMAKE_CXX_FLAGS "-march=native")/d' 'source/CMakeLists.txt' + ''; + postInstall = '' mkdir $out/lib $out/share mv $out/obs-plugins/64bit $out/lib/obs-plugins diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index e58220bce7e81..c34f821d7c6ad 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fzwoch/obs-gstreamer"; maintainers = with maintainers; [ ahuzik pedrohlc ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index a56c18479fd15..f9a09b450bbb2 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 = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-kQIDOjux+8d9V4VCxDtKuWpBKPjdB50WmOPYmzxOCTU="; + sha256 = "sha256-Y0FTNxwpCOp/3XkHxZ4H0ja840R7/c2dTDImUf5iZQE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix index c3987ab33ff08..42682dd146142 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-replay-source.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-replay-source"; - version = "1.6.13"; + version = "1.6.13-unstable-2024-02-03"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-replay-source"; - rev = finalAttrs.version; - sha256 = "sha256-i64rpIVnUplA9AKZtR3xeByeawca7B00kGmEcKi7DWQ="; + rev = "6590fde1c8e4f8c733016646a8165d52e28d094b"; + hash = "sha256-foIzWNlU72FWXZVWR8TEiqJJMfl1vWYDTyhV6thYJbA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix index 7850d0229f245..bc27eca43d03f 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-clone.nix @@ -5,22 +5,22 @@ , obs-studio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "obs-source-clone"; - version = "0.1.4"; + version = "0.1.4-unstable-2024-02-19"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-clone"; - rev = version; - sha256 = "sha256-E2pHJO3cdOXmSlTVGsz4tncm9fMaa8Rhsq9YZDNidjs="; + rev = "d1524d5d932d6841a1fbd6061cc4a0033fb615b7"; + hash = "sha256-W9IIIGQdreI2FQGii5NUB5tVHcqsiYAKTutOHEPCyms="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; cmakeFlags = [ - "-DBUILD_OUT_OF_TREE=On" + (lib.cmakeBool "BUILD_OUT_OF_TREE" true) ]; postInstall = '' @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/exeldro/obs-source-clone"; maintainers = with maintainers; [ flexiondotorg ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index 7cf0bc33c867d..246729639e40a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "obs-teleport"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-teleport"; rev = version; - sha256 = "sha256-r9j9hePA7MFIECCwHJYLHJMUKmYQrHkJ7FM3LhXGFOY="; + sha256 = "sha256-vT5GhZQFunQURgnFI3RSGVlwvcWEW588MuJ+Ev7IZ7w="; }; - vendorHash = "sha256-d7Wtc4nrVEf2TA8BI96Vj9BPOgTtfY+1dQVcEsED1ww="; + vendorHash = "sha256-Po7Oj+wdBOOFI2Ws9MLZQxk4N6mE58M+3q+qNlUrqOY="; buildInputs = [ libjpeg diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 08109434a0b72..e059412e17fa1 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.4.7"; + version = "1.5.0"; src = fetchFromGitHub { owner = "nowrep"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-/EbavDDeFQys9zu3FAgsAeVVbs1Rrv8YR4949XCHc6s="; + hash = "sha256-hYPQ1N4k4eb+bvGWZqaQJ/C8C5Lh8ooZ03raGF5ORgE="; }; cmakeFlags = lib.optionals stdenv.isi686 [ @@ -51,6 +51,16 @@ stdenv.mkDerivation (finalAttrs: { obs-studio ]; + postPatch = '' + substituteInPlace src/glinject.c \ + --replace "libGLX.so.0" "${lib.getLib libGL}/lib/libGLX.so.0" \ + --replace "libX11.so.6" "${lib.getLib libX11}/lib/libX11.so.6" \ + --replace "libX11-xcb.so.1" "${lib.getLib libX11}/lib/libX11-xcb.so.1" \ + --replace "libxcb-dri3.so.0" "${lib.getLib libxcb}/lib/libxcb-dri3.so.0" \ + --replace "libEGL.so.1" "${lib.getLib libGL}/lib/libEGL.so.1" \ + --replace "libvulkan.so.1" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + ''; + # Support 32bit Vulkan applications by linking in the 32bit Vulkan layer postInstall = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' ln -s ${obs-vkcapture32}/share/vulkan/implicit_layer.d/obs_vkcapture_32.json \ diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index 4bbcc65555363..00fcf4298d5d1 100644 --- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; postFixup = '' - mkdir $out/lib $out/share + mkdir -p $out/lib $out/share/obs/obs-plugins mv $out/${pname}/bin/64bit $out/lib/obs-plugins - mv $out/${pname}/data $out/share/obs + mv $out/${pname}/data $out/share/obs/obs-plugins/${pname} rm -rf $out/${pname} ''; diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index 4c31c97d5b1d3..167b5e8601e25 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qmplay2"; - version = "24.03.16"; + version = "24.04.07"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-yIBQBRdmaY7qaBirANxMqfm5vn3T4usokJUxwSYUHjQ="; + hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index ac74ed748f41c..543b2b524708f 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,6 +1,7 @@ { autoPatchelfHook , fetchurl , lib +, copyDesktopItems , makeDesktopItem , makeWrapper , stdenv @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { alsa-lib autoPatchelfHook cairo + copyDesktopItems cups.lib dbus.lib expat @@ -92,8 +94,12 @@ stdenv.mkDerivation rec { # Install all files, remove unnecessary ones cp -a . $out/opt/${basename}/ rm -r $out/opt/${basename}/{{add,remove}-menuitem.sh,credits.html,icons/} - ln -s "$out/opt/${basename}/${basename}" $out/bin/ - cp -r "${desktopItem}/share/applications" $out/share/ + ln -s $out/opt/${basename}/${basename} $out/bin/ + for res in 16 32 48 64 128 256; do + install -Dm644 \ + icons/icon-"$res".png \ + $out/share/icons/hicolor/"$res"x"$res"/apps/${basename}.png + done runHook postInstall ''; @@ -105,14 +111,14 @@ stdenv.mkDerivation rec { ) ''; - desktopItem = makeDesktopItem { + desktopItems = [(makeDesktopItem { name = basename; exec = basename; icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; categories = [ "AudioVideo" "Network" ]; - }; + })]; meta = with lib; { description = "Twitch.tv browser for Streamlink"; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 2eda19313e1c3..b6522aef23975 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,19 +1,31 @@ { lib , python3Packages , fetchPypi +, substituteAll , ffmpeg }: python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.0"; - format = "pyproject"; + version = "6.7.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kjrDJ/QCccWxRLEQ0virAdm0TLxN5PmtO/Zs+4Nc1MM="; + hash = "sha256-Da+J+NOXW+n55LvaPQw6XiRhJJQ4Pc4Z1p21qMym/Xw="; }; + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = lib.getExe ffmpeg; + }) + ]; + + nativeBuildInputs = with python3Packages; [ + setuptools + ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock @@ -23,7 +35,12 @@ python3Packages.buildPythonApplication rec { pytest-trio ]; - propagatedBuildInputs = (with python3Packages; [ + disabledTests = [ + # requires ffmpeg to be in PATH + "test_no_cache" + ]; + + propagatedBuildInputs = with python3Packages; [ certifi isodate lxml @@ -36,8 +53,6 @@ python3Packages.buildPythonApplication rec { typing-extensions urllib3 websocket-client - ]) ++ [ - ffmpeg ]; meta = with lib; { diff --git a/pkgs/applications/video/streamlink/ffmpeg-path.patch b/pkgs/applications/video/streamlink/ffmpeg-path.patch new file mode 100644 index 0000000000000..6108c53dcf0be --- /dev/null +++ b/pkgs/applications/video/streamlink/ffmpeg-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/streamlink/stream/ffmpegmux.py b/src/streamlink/stream/ffmpegmux.py +index 258b314a..c493e010 100644 +--- a/src/streamlink/stream/ffmpegmux.py ++++ b/src/streamlink/stream/ffmpegmux.py +@@ -80,7 +80,7 @@ class MuxedStream(Stream, Generic[TSubstreams]): + + + class FFMPEGMuxer(StreamIO): +- __commands__: ClassVar[List[str]] = ["ffmpeg"] ++ __commands__: ClassVar[List[str]] = ["@ffmpeg@"] + + DEFAULT_OUTPUT_FORMAT = "matroska" + DEFAULT_VIDEO_CODEC = "copy" diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 03ccb4b9f066f..a967a872cd997 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, qmake, wrapQtAppsHook -, mpv, qtwebengine, qtwebchannel, nodejs +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, ffmpeg +, mpv +, nodejs +, qmake +, qtwebchannel +, qtwebengine +, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -30,6 +39,8 @@ stdenv.mkDerivation rec { install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s $server $out/opt/stremio/server.js + wrapProgram $out/bin/stremio \ + --suffix PATH ":" ${lib.makeBinPath [ ffmpeg ]} ''; meta = with lib; { diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index e08ac36db3f04..924f0fc44e0eb 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.2"; + version = "4.0.5"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-kcs2h6HeWniJhGDNsy+EBauXbiDIlLCOJkVOCIzLBzM="; + hash = "sha256-qYDLUqC5adzpmlQIq/EKmrkN8D8/EHZmP8QUGAaYf+s="; stripRoot = false; }; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 180315e5072ff..5b62399a04651 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -10,7 +10,7 @@ , youtube-dl , glib , ffmpeg -, aria +, aria2 }: python3Packages.buildPythonApplication rec { @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { playsound ffmpeg matplotlib - aria + aria2 ]; buildInputs = [ diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 88baeafe1871f..294e250f7c8e1 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.48"; + version = "6.4"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - hash = "sha256-R1HL8tYFDtHrxArcoJwlM0Y7MbSyNxNiZ2tjyh1OCn4="; + hash = "sha256-pTfct+nki1t7ltCUnxSyOkDocSr2pkoqOldkECtNfDU="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index db273ba4ff047..28dad0200270a 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.12"; + version = "3.4.13"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-yc/zWMGzsfZl3n+Qt5Se2duo3jwntCWaYq1yACsrPzM="; + sha256 = "sha256-pDnziIWX6deBXuVIN7w6F6TdYDCcEO6MSaUIMB63uAg="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index bfa1039d5d330..63e9f51304edb 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -6,6 +6,7 @@ , xorg , stdenv , python3 +, makeBinaryWrapper , libsixel , mpv , CoreFoundation @@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Siriusmart"; - repo = pname; + repo = "youtube-tui"; rev = "v${version}"; hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M="; }; @@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config python3 + makeBinaryWrapper ]; buildInputs = [ @@ -47,6 +49,12 @@ rustPlatform.buildRustPackage rec { AppKit ]; + # sixel-sys is dynamically linked to libsixel + postInstall = lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/youtube-tui \ + --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" + ''; + meta = with lib; { description = "An aesthetically pleasing YouTube TUI written in Rust"; homepage = "https://siriusmart.github.io/youtube-tui"; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 4798e324141d6..79df60253ff59 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -24,41 +24,39 @@ # Usually, this option is broken, do not use it except if you know what you are # doing. , sourceDebug ? false +, projectDscPath ? { + i686 = "OvmfPkg/OvmfPkgIa32.dsc"; + x86_64 = "OvmfPkg/OvmfPkgX64.dsc"; + aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc"; + riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; + }.${stdenv.hostPlatform.parsed.cpu.name} + or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}") +, fwPrefix ? { + i686 = "OVMF"; + x86_64 = "OVMF"; + aarch64 = "AAVMF"; + riscv64 = "RISCV_VIRT"; + }.${stdenv.hostPlatform.parsed.cpu.name} + or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}") +, metaPlatforms ? edk2.meta.platforms }: let platformSpecific = { - i686 = { - projectDscPath = "OvmfPkg/OvmfPkgIa32.dsc"; - fwPrefix = "OVMF"; + x86_64.msVarsArgs = { + flavor = "OVMF_4M"; + archDir = "X64"; }; - x86_64 = { - projectDscPath = "OvmfPkg/OvmfPkgX64.dsc"; - fwPrefix = "OVMF"; - msVarsArgs = { - flavor = "OVMF_4M"; - archDir = "X64"; - }; - }; - aarch64 = { - projectDscPath = "ArmVirtPkg/ArmVirtQemu.dsc"; - fwPrefix = "AAVMF"; - msVarsArgs = { - flavor = "AAVMF"; - archDir = "AARCH64"; - }; - }; - riscv64 = { - projectDscPath = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; - fwPrefix = "RISCV_VIRT"; + aarch64.msVarsArgs = { + flavor = "AAVMF"; + archDir = "AARCH64"; }; }; cpuName = stdenv.hostPlatform.parsed.cpu.name; - inherit (platformSpecific.${cpuName}) - projectDscPath fwPrefix msVarsArgs; + inherit (platformSpecific.${cpuName}) msVarsArgs; version = lib.getVersion edk2; @@ -152,6 +150,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: { # release notes accordingly. postInstall = '' mkdir -vp $fd/FV + '' + lib.optionalString (builtins.elem fwPrefix [ + "OVMF" "AAVMF" "RISCV_VIRT" + ]) '' mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV '' + lib.optionalString stdenv.hostPlatform.isx86 '' mv -v $out/FV/${fwPrefix}.fd $fd/FV @@ -184,7 +185,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; - inherit (edk2.meta) platforms; + platforms = metaPlatforms; maintainers = with lib.maintainers; [ adamcstephens raitobezarius ]; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 7599c5eb6652b..3a8c5a5593237 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B8uloch+ucOLIIR64GE5Z8ahe2NLqPmDGcugQVSqpl4="; + hash = "sha256-+htd9RJGSFzzyEQSBJGIzurQDQgpJ+sJHLPe3aPH0cg="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoHash = "sha256-hEhAnNppiyY6EcdHfri534ih8VUfpT7lO9L4mFJ6Caw="; + cargoHash = "sha256-CcWji/qMd7eX0O3cR9/FLID17WpSfz4kEAhDgKb3jds="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index acac16093affb..c89c0596536ec 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.14"; + version = "1.7.15"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-okTz2UCF5LxOdtLDBy1pN2to6WHi+I0jtR67sn7Qrbk="; + hash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 3e70bd390e16c..1dbfaa298e345 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,18 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "121.3"; + version = "123.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "1e7125327a29b7b7a0593caf339d382728c55cf6"; - sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0="; + # This is actually one commit before release 123, because the final + # commit breaks the build and gets reverted in future releases. + rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72"; + hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs="; + cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner @@ -30,9 +32,10 @@ rustPlatform.buildRustPackage rec { patchShebangs third_party/minijail/tools/*.py ''; + CROSVM_USE_SYSTEM_MINIGBM = true; CROSVM_USE_SYSTEM_VIRGLRENDERER = true; - buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; + buildFeatures = [ "virgl_renderer" ]; passthru.updateScript = ./update.py; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index cf4a13dee0311..fdfafda6acff2 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -38,6 +38,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; mainProgram = "ddev"; - maintainers = with maintainers; [ star-szr ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch b/pkgs/applications/virtualization/distrobox/always-mount-nix.patch deleted file mode 100644 index c5df13294e920..0000000000000 --- a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/distrobox-create b/distrobox-create -index 64e9911..136659d 100755 ---- a/distrobox-create -+++ b/distrobox-create -@@ -74,6 +74,10 @@ unshare_ipc=0 - unshare_netns=0 - unshare_process=0 - unshare_devsys=0 -+ -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Use cd + dirname + pwd so that we do not have relative paths in mount points - # We're not using "realpath" here so that symlinks are not resolved this way - # "realpath" would break situations like Nix or similar symlink based package -@@ -98,6 +102,7 @@ version="1.6.0.1" - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-enter b/distrobox-enter -index 6d8998a..bb05437 100755 ---- a/distrobox-enter -+++ b/distrobox-enter -@@ -75,10 +75,14 @@ skip_workdir=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-generate-entry b/distrobox-generate-entry -index 3243691..6a7910a 100755 ---- a/distrobox-generate-entry -+++ b/distrobox-generate-entry -@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg" - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-list b/distrobox-list -index aaec85e..235e529 100755 ---- a/distrobox-list -+++ b/distrobox-list -@@ -44,10 +44,14 @@ verbose=0 - version="1.6.0.1" - container_manager="autodetect" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-rm b/distrobox-rm -index 702c1dd..2e37538 100755 ---- a/distrobox-rm -+++ b/distrobox-rm -@@ -54,10 +54,14 @@ rm_home=0 - response_rm_home="N" - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-stop b/distrobox-stop -index fd17cc1..e0dbc8f 100755 ---- a/distrobox-stop -+++ b/distrobox-stop -@@ -52,10 +52,14 @@ non_interactive=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-upgrade b/distrobox-upgrade -index ab5e96f..dc8d295 100755 ---- a/distrobox-upgrade -+++ b/distrobox-upgrade -@@ -39,10 +39,14 @@ rootful=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 912117a016edc..4d5317201ad0d 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.6.0.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-UWrXpb20IHcwadPpwbhSjvOP1MBXic5ay+nP+OEVQE4="; + hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng="; }; dontConfigure = true; @@ -16,9 +16,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; - # https://github.com/89luca89/distrobox/pull/1080 - patches = [ ./always-mount-nix.patch ]; - installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 4fd57de63a5a9..de13fcf5ea1e3 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.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ="; + hash = "sha256-mesFwYgDCZ44/EJ31mzx9yLeMyV2bXpxaNSx6L3BQG0="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index d6cc632bfbdc1..3e344a653614b 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.25.0"; + version = "2.26.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-QfzFo6VqNK+4GvF2sSVLeDTcoBOG8Jtqs6K5o5bwddA="; + hash = "sha256-R/AFjJM4rcu2JbdfTNhxIIVhaP7LzFrDAU93hbuXSXs="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-zAIf5ljy9trJE27RpsK0atPoqNIDUdTn6ywRo0yk/18="; + vendorHash = "sha256-SzySXS0s0p1EXcO5RQyATBG9gtoJ4wPxZKGU62fAOHw="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index a82a00fd5412e..e30ad02f5bc81 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -12,7 +12,7 @@ rec { # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd, runc, tini, libtool , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests @@ -137,6 +137,7 @@ rec { installPhase = '' cd ./go/src/${goPackagePath} install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd + install -Dm755 ./bundles/dynbinary-daemon/docker-proxy $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" @@ -144,7 +145,6 @@ rec { ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init # systemd @@ -172,7 +172,7 @@ rec { buildGoPackage (lib.optionalAttrs (!clientOnly) { # allow overrides of docker components # TODO: move packages out of the let...in into top-level to allow proper overrides - inherit docker-runc docker-containerd docker-proxy docker-tini moby; + inherit docker-runc docker-containerd docker-tini moby; } // rec { pname = "docker"; inherit version; @@ -294,9 +294,23 @@ rec { }; docker_25 = callPackage dockerGen rec { - version = "25.0.3"; + version = "25.0.5"; cliRev = "v${version}"; - cliHash = "sha256-Jvb0plV1O/UzrcpzN4zH5OulmTVF+p9UQQQ9xqkiObQ="; + cliHash = "sha256-CACMi3bXUN6oGc2f/Z+lNQqMgQ4llRWPRKgijdpiPGg="; + mobyRev = "v${version}"; + mobyHash = "sha256-4QGz22fXxyAD77pyUWb2lF3VKqxmPIrGqcJGoyrEHew="; + runcRev = "v1.1.12"; + runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; + containerdRev = "v1.7.13"; + containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + + docker_26 = callPackage dockerGen rec { + version = "26.0.0"; + cliRev = "v${version}"; + cliHash = "sha256-jGg/AVnIzI8e+DdF0uKlSZApRxcwuOjCQpfnBaCY4fI="; mobyRev = "v${version}"; mobyHash = "sha256-cDlRVdQNzH/X2SJUYHK1QLUHlKQtSyRYCVbz3wPx1ZM="; runcRev = "v1.1.12"; @@ -306,4 +320,5 @@ rec { tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + } diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix deleted file mode 100644 index e4f5435247643..0000000000000 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "docker-proxy"; - version = "unstable-2020-12-15"; - - src = fetchFromGitHub { - owner = "docker"; - repo = "libnetwork"; - rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; - sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; - }; - - goPackagePath = "github.com/docker/libnetwork"; - - installPhase = '' - install -m755 -D ./go/bin/proxy $out/bin/docker-proxy - ''; - - meta = with lib; { - description = "Docker proxy binary to forward traffic between host and containers"; - mainProgram = "docker-proxy"; - license = licenses.asl20; - homepage = "https://github.com/docker/libnetwork"; - maintainers = with maintainers; [vdemeester]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index f2ab0d8f4e78a..c44f101ba9464 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: let # Upstream versioned download links are broken @@ -40,7 +40,7 @@ let ]; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "win-pvdrivers"; version = "unstable-2023-08-17"; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 0edf112d72bc5..c3a28e4be4fe7 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.0"; + version = "1.82.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-joI2jNfH4++mpReVGO9V3Yc7cRpykc3F166WEGZ09HA="; + hash = "sha256-2a8QBdL28iHVTE+Xo1I+89pFBeWndPqT072SHB498SQ="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index d9bab21696233..eeabb94536e12 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.6.0"; + version = "1.7.0"; # nixpkgs-update: no auto update suffix = { @@ -13,7 +13,7 @@ let dlbin = sha256: fetchurl { url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - sha256 = sha256."${stdenv.hostPlatform.system}"; + sha256 = sha256."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; in @@ -23,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-FflAYvWTcigIchVrAaUgg6IRleEtis6eh6fCqrZ5lb8="; - aarch64-linux = "sha256-4O0kPMl7RbMjszUNql0OQrl/4or/e8ZCHPngqq0CNxk="; + x86_64-linux = "sha256-Vb0+bVmf3RCONuUvmu4jGfBsGKkPL6SbZOk/3wb1/1M="; + aarch64-linux = "sha256-PLoQA4a6qulxSns/ZRSgn6EtHr46/hstNhP1pAHt9VA="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix deleted file mode 100644 index 67917b6b02fd2..0000000000000 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, nixosTests -, buildGoModule -, fetchFromGitHub -, iproute2 -, iptables -, makeWrapper -, procps -}: - -buildGoModule { - pname = "gvisor"; - version = "20231113.0"; - - # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) - # that can be used to build gvisor without bazel. - # For updates, you should stick to the commits labeled "Merge release-** (automated)" - - src = fetchFromGitHub { - owner = "google"; - repo = "gvisor"; - rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24"; - hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI="; - }; - - vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs="; - - nativeBuildInputs = [ makeWrapper ]; - - CGO_ENABLED = 0; - - ldflags = [ "-s" "-w" ]; - - subPackages = [ "runsc" "shim" ]; - - postInstall = '' - # Needed for the 'runsc do' subcommand - wrapProgram $out/bin/runsc \ - --prefix PATH : ${lib.makeBinPath [ iproute2 iptables procps ]} - mv $out/bin/shim $out/bin/containerd-shim-runsc-v1 - ''; - - passthru.tests = { inherit (nixosTests) gvisor; }; - - meta = with lib; { - description = "Application Kernel for Containers"; - homepage = "https://github.com/google/gvisor"; - license = licenses.asl20; - maintainers = with maintainers; [ andrew-d gpl ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index ca7384cdd19b1..4d52565bcdb21 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.7.5"; + version = "0.8.3"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-kuI1RSipPj7e8tsnThAEkL3bpmgAEKSQthubfjtklp0="; + hash = "sha256-or1UstxYbj3QvgnoQPT2vyQTVZDIKPMDMxRGtN0n0lk="; }; - vendorHash = "sha256-BPpUBGWzW4jkUgy/2oqvqXBNLmglUVTFA9XuGhUE1zo="; + vendorHash = "sha256-UyDaEwXTMbyAUghvHS/LcT2Yzz7CJ2xGelF19kgRNec="; ldflags = [ "-s" diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index d9d89dfee112a..952ec6304e294 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.20.2"; + version = "0.21.0"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "f250bed8a20b705f913e382b545641082f278f44687409f4b897d6430df4d735"; + sha256 = "97a0517ff5d72feb30ff413f5f0ef75e4c07982651bb2f7326fe5faadb0232d9"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "bec9933254ed80827a6fd38eabe1234b538bdb783f4656a94e120bcaa5689d37"; + sha256 = "f4a3a01d0ca13bd1bddf14766f39569bc3e074c7744b54d33e9336b1b55e77c9"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "0b839459aa3adde059577f7d9c3ed1bb4720dbdad798e4ffe00af5d86afa556e"; + sha256 = "6d3f1fe0ef561e1513579a1bf85b04f1bebe73b4c1f03d8683551ece34fecc6a"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "f9af6bd42e48a803fc1aeb5214bdf511582a56701a1c058ce4e66d871db65dd8"; + sha256 = "9a75c8700a988b35986ed6f761f398fdb31d56394a8e2b6801566a86e59b346c"; }; }; in diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index a740276509607..4da9c50ef7712 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.20.2"; + version = "0.21.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xFiCGuCUJUnWN5DBfwjhBgntDfod4CWpXqJ3dbrDUSQ="; + sha256 = "sha256-D7HpRM0bYUELNUG8/CMKjowqBJzEJS2unuA5YdRFToo="; }; - vendorHash = "sha256-wd7YiEo4Gy2kHF7aCRoNGlbOQUxqQnKqP3znzMqS2PI="; + vendorHash = "sha256-CkXO6d3ricm+CclIByx2SUXlklM5XmEjTgipKP0wCLY="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch new file mode 100644 index 0000000000000..b044fb47c2e1f --- /dev/null +++ b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch @@ -0,0 +1,57 @@ +From: Geoffrey McRae <geoff@hostfission.com> +Date: Wed, 13 Mar 2024 11:17:25 +1100 +Subject: [PATCH] [client] cmake: move X11 config directives to + `displayservers` + +--- + client/CMakeLists.txt | 7 ------- + client/displayservers/CMakeLists.txt | 7 +++++++ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git client/CMakeLists.txt client/CMakeLists.txt +index 3755adcf..eeeb3eb0 100644 +--- client/CMakeLists.txt ++++ client/CMakeLists.txt +@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.") + option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF) + add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.") + +-option(ENABLE_X11 "Build with X11 support" ON) +-add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") +- + option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON) + add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.") + + option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON) + add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.") + +-if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) +- message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") +-endif() +- + add_compile_options( + "-Wall" + "-Wextra" +diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt +index 5b5f827a..e7c4b25a 100644 +--- client/displayservers/CMakeLists.txt ++++ client/displayservers/CMakeLists.txt +@@ -18,9 +18,16 @@ function(add_displayserver name) + add_subdirectory(${name}) + endfunction() + ++option(ENABLE_X11 "Build with X11 support" ON) ++add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.") ++ + option(ENABLE_WAYLAND "Build with Wayland support" ON) + add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.") + ++if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND) ++ message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on") ++endif() ++ + # Add/remove displayservers here! + if (ENABLE_WAYLAND) + add_displayserver(Wayland) +-- +2.43.1 diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 67baa3ab91bd2..4b224c745c9fc 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -22,6 +22,7 @@ , libXinerama , libXcursor , libXpresent +, libXdmcp , wayland , wayland-protocols @@ -30,6 +31,7 @@ , pulseaudio , libsamplerate +, openGLSupport ? true , xorgSupport ? true , waylandSupport ? true , pipewireSupport ? true @@ -43,35 +45,39 @@ let type = "Application"; exec = "looking-glass-client"; icon = "lg-logo"; - terminal = true; }; in stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B6"; + version = "B7-rc1"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "sha256-6vYbNmNJBCoU23nVculac24tHqH7F4AZVftIjL93WJU="; + sha256 = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; fetchSubmodules = true; }; + patches = [ + # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland. + ./0001-client-cmake-move-X11-config-directives-to-displayse.patch + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libGL libX11 freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] - ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr ] + buildInputs = [ libX11 libGL freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] + ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr libXdmcp ] ++ lib.optionals waylandSupport [ libxkbcommon wayland wayland-protocols ] ++ lib.optionals pipewireSupport [ pipewire libsamplerate ] ++ lib.optionals pulseSupport [ pulseaudio libsamplerate ]; cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ] - ++ lib.optional (!xorgSupport) "-DENABLE_X11=no" - ++ lib.optional (!waylandSupport) "-DENABLE_WAYLAND=no" - ++ lib.optional (!pulseSupport) "-DENABLE_PULSEAUDIO=no" - ++ lib.optional (!pipewireSupport) "-DENABLE_PIPEWIRE=no"; - + ++ lib.optionals (!openGLSupport) [ "-DENABLE_OPENGL=no" ] + ++ lib.optionals (!xorgSupport) [ "-DENABLE_X11=no" ] + ++ lib.optionals (!waylandSupport) [ "-DENABLE_WAYLAND=no" ] + ++ lib.optionals (!pulseSupport) [ "-DENABLE_PULSEAUDIO=no" ] + ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ]; postUnpack = '' echo ${src.rev} > source/VERSION diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index acf7456c76abb..5bbb8b217525a 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.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GY5fwmwr2FAJB9SjTaghlC4GD6ECnect21VInTXseRE="; + sha256 = "sha256-niEuOsSOjHDP4KEax/OqQfxWC3XmTRUKB8k0DQ3Ybq0="; }; - cargoHash = "sha256-kXfNWAloMwpykv6zJS5g6ng8RGn+NBNgYJmUg/I7dBg="; + cargoHash = "sha256-LMVYrxYpkwM9rdGkKaeLFKB+B2HI+AEDwrdBCAFLpJQ="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 9c3f3f74e6a62..e5dde1e021c7f 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.3.5"; + version = "12.4.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-OuESPenXVDKLckIZ3sQCtQXZXCL6xSLZOxZWVEX2XMk="; + hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 8671617a40431..29bfbfa781898 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml }: +{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pipBuildHook, pypaBuildHook }: buildPythonApplication rec { - version = "1.0.6"; + version = "1.1.0"; pname = "podman-compose"; + pyproject = true; src = fetchFromGitHub { repo = "podman-compose"; owner = "containers"; rev = "v${version}"; - sha256 = "sha256-TsNM5xORqwWge+UCijKptwbAcIz1uZFN9BuIOl28vIU="; + sha256 = "sha256-uNgzdLrnDIABtt0L2pvsil14esRzl0XcWohgf7Oksr8="; }; - propagatedBuildInputs = [ pyyaml python-dotenv ]; + + build-system = [ + setuptools + ]; + + dependencies = [ python-dotenv pyyaml ]; + propagatedBuildInputs = [ pypaBuildHook ]; meta = { description = "An implementation of docker-compose with podman backend"; diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 80c013becb405..fdf8294013990 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , yarn -, prefetch-yarn-deps +, fixup-yarn-lock , nodejs , makeWrapper , copyDesktopItems @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn - prefetch-yarn-deps + fixup-yarn-lock nodejs makeWrapper copyDesktopItems diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index d6d80461c674a..8e035b87533bd 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "podman-tui"; - version = "0.18.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - hash = "sha256-T2hiCRoZqdbcB36Tpy597j7Hc1yeR2MijQbuheENfuA="; + hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw="; }; vendorHash = null; @@ -24,11 +24,11 @@ buildGoModule rec { let skippedTests = [ "TestDialogs" + "TestVoldialogs" ]; in '' - export USER=$(whoami) - export HOME=/home/$USER + export HOME="$(mktemp -d)" # Disable flaky tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") @@ -36,7 +36,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = podman-tui; - command = "podman-tui version"; + command = "HOME=$(mktemp -d) podman-tui version"; version = "v${version}"; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 30a259d125405..92935ed129d8a 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,9 +17,12 @@ , makeWrapper , runtimeShell , symlinkJoin +, substituteAll , extraPackages ? [ ] , runc , crun +, gvisor +, youki , conmon , slirp4netns , fuse-overlayfs @@ -30,6 +33,7 @@ , gvproxy , aardvark-dns , netavark +, passt , testers , podman }: @@ -37,9 +41,6 @@ let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ - runc - crun - conmon fuse-overlayfs util-linux iptables @@ -57,23 +58,29 @@ let catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark slirp4netns + passt ]; }; in buildGoModule rec { pname = "podman"; - version = "4.9.3"; + version = "5.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-PdAXcXtc/Jl3ttWWB6TciiOwWescJ51Glhf2ZhOw550="; + hash = "sha256-8Swqwyzu/WI9mG21bLF81Kk4kS2Ltg0GV9G3EcG/FnU="; }; patches = [ # we intentionally don't build and install the helper so we shouldn't display messages to users about it ./rm-podman-mac-helper-msg.patch + ] ++ lib.optionals stdenv.isLinux [ + (substituteAll { + src = ./hardcode-paths.patch; + inherit crun runc gvisor youki conmon; + }) ]; vendorHash = null; @@ -155,5 +162,6 @@ buildGoModule rec { changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; + mainProgram = "podman"; }; } diff --git a/pkgs/applications/virtualization/podman/hardcode-paths.patch b/pkgs/applications/virtualization/podman/hardcode-paths.patch new file mode 100644 index 0000000000000..05394f62877a1 --- /dev/null +++ b/pkgs/applications/virtualization/podman/hardcode-paths.patch @@ -0,0 +1,109 @@ +diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go +index 19c4bb6bf..2743de4b2 100644 +--- a/vendor/github.com/containers/common/pkg/config/default.go ++++ b/vendor/github.com/containers/common/pkg/config/default.go +@@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) { + c.Retry = 3 + c.OCIRuntimes = map[string][]string{ + "crun": { +- "/usr/bin/crun", +- "/usr/sbin/crun", +- "/usr/local/bin/crun", +- "/usr/local/sbin/crun", +- "/sbin/crun", +- "/bin/crun", +- "/run/current-system/sw/bin/crun", ++ "@crun@/bin/crun", + }, + "crun-vm": { +- "/usr/bin/crun-vm", +- "/usr/local/bin/crun-vm", +- "/usr/local/sbin/crun-vm", +- "/sbin/crun-vm", +- "/bin/crun-vm", +- "/run/current-system/sw/bin/crun-vm", ++ // TODO: "@crun-vm@/bin/crun-vm", + }, + "crun-wasm": { +- "/usr/bin/crun-wasm", +- "/usr/sbin/crun-wasm", +- "/usr/local/bin/crun-wasm", +- "/usr/local/sbin/crun-wasm", +- "/sbin/crun-wasm", +- "/bin/crun-wasm", +- "/run/current-system/sw/bin/crun-wasm", ++ // TODO: "@crun-wasm@/bin/crun-wasm", + }, + "runc": { +- "/usr/bin/runc", +- "/usr/sbin/runc", +- "/usr/local/bin/runc", +- "/usr/local/sbin/runc", +- "/sbin/runc", +- "/bin/runc", +- "/usr/lib/cri-o-runc/sbin/runc", +- "/run/current-system/sw/bin/runc", ++ "@runc@/bin/runc", + }, + "runj": { +- "/usr/local/bin/runj", ++ // TODO: "@runj@/bin/runj", + }, + "kata": { +- "/usr/bin/kata-runtime", +- "/usr/sbin/kata-runtime", +- "/usr/local/bin/kata-runtime", +- "/usr/local/sbin/kata-runtime", +- "/sbin/kata-runtime", +- "/bin/kata-runtime", +- "/usr/bin/kata-qemu", +- "/usr/bin/kata-fc", ++ // TODO: "@kata@/bin/kata", + }, + "runsc": { +- "/usr/bin/runsc", +- "/usr/sbin/runsc", +- "/usr/local/bin/runsc", +- "/usr/local/sbin/runsc", +- "/bin/runsc", +- "/sbin/runsc", +- "/run/current-system/sw/bin/runsc", ++ "@gvisor@/bin/runsc", + }, + "youki": { +- "/usr/local/bin/youki", +- "/usr/bin/youki", +- "/bin/youki", +- "/run/current-system/sw/bin/youki", ++ "@youki@/bin/youki", + }, + "krun": { +- "/usr/bin/krun", +- "/usr/local/bin/krun", ++ // TODO: "@krun@/bin/krun", + }, + "ocijail": { +- "/usr/local/bin/ocijail", ++ // TODO: "@ocijail@/bin/ocijail", + }, + } + c.PlatformToOCIRuntime = map[string]string{ +@@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) { + // Needs to be called after populating c.OCIRuntimes. + c.OCIRuntime = c.findRuntime() + +- c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"}) ++ c.ConmonEnvVars.Set([]string{}) + c.ConmonPath.Set([]string{ +- "/usr/libexec/podman/conmon", +- "/usr/local/libexec/podman/conmon", +- "/usr/local/lib/podman/conmon", +- "/usr/bin/conmon", +- "/usr/sbin/conmon", +- "/usr/local/bin/conmon", +- "/usr/local/sbin/conmon", +- "/run/current-system/sw/bin/conmon", ++ "@conmon@/bin/conmon", + }) + c.ConmonRsPath.Set([]string{ + "/usr/libexec/podman/conmonrs", diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch index 179ce41f02b27..4cc253c4c68f0 100644 --- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch +++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch @@ -1,8 +1,22 @@ diff --git a/pkg/machine/machine_common.go b/pkg/machine/machine_common.go -index 4e43dd54c..a981d93bf 100644 +index 1afc3d15b..a8aafcaae 100644 --- a/pkg/machine/machine_common.go +++ b/pkg/machine/machine_common.go -@@ -127,14 +127,6 @@ address can't be used by podman. ` +@@ -33,13 +33,8 @@ func GetDevNullFiles() (*os.File, *os.File, error) { + // WaitAPIAndPrintInfo prints info about the machine and does a ping test on the + // API socket + func WaitAPIAndPrintInfo(forwardState APIForwardingState, name, helper, forwardSock string, noInfo, rootful bool) { +- suffix := "" + var fmtString string + +- if name != DefaultMachineName { +- suffix = " " + name +- } +- + if forwardState == NoForwarding { + return + } +@@ -61,14 +56,6 @@ address can't be used by podman. ` if len(helper) < 1 { fmt.Print(fmtString) @@ -12,7 +26,7 @@ index 4e43dd54c..a981d93bf 100644 - sudo %s install - podman machine stop%[2]s; podman machine start%[2]s - -- ` +-` - fmt.Printf(fmtString, helper, suffix) } case MachineLocal: diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix index b6eaea8d75978..718446d1ce1f6 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -1,21 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, SDL_compat, libX11, libXext }: +{ lib +, stdenv +, fetchFromGitHub + +, SDL2 + +, libX11 +, libXext + +, guiBackend ? "sdl" + +, enableSDL ? guiBackend == "sdl" +, enableX11 ? guiBackend == "x11" +}: + +assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend"; +assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time"; +assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; stdenv.mkDerivation rec { pname = "rvvm"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "LekKit"; repo = "RVVM"; rev = "v${version}"; - sha256 = "sha256-1wAKijRYB0FGBe4cSHUynkO4ePVG4QvVIgSoWzNbqtE="; + sha256 = "sha256-5nSlKyWDAx0EeKFzzwP5+99XuJz9BHXEF1WNkRMLa9U="; }; - buildInputs = if stdenv.isDarwin then [ SDL_compat ] else [ libX11 libXext ]; + buildInputs = [] + ++ lib.optionals enableSDL [ SDL2 ] + ++ lib.optionals enableX11 [ libX11 libXext ]; + + enableParallelBuilding = true; buildFlags = [ "all" "lib" ]; 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"; @@ -24,7 +48,7 @@ stdenv.mkDerivation rec { description = "The RISC-V Virtual Machine"; license = with licenses; [ gpl3 /* or */ mpl20 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kamillaova ]; mainProgram = "rvvm"; }; } diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index fd46baba6fcee..e8791404fb875 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.6.0"; + version = "2.7.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-QtVqgmjYpLAhFibW1DIVWNYiOjHB1X/YY6zRVB+1soA="; + hash = "sha256-Z/LZ8g1/FYT7Jh943tFxN8L5HeNf0CVz1VEJj+2fCd8="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3e0c24877fdf3..813e77db435cf 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { ''; nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook + pytest7CheckHook cpio cdrtools xorriso diff --git a/pkgs/applications/virtualization/virter/default.nix b/pkgs/applications/virtualization/virter/default.nix index 6d403feffa29a..a36f6b1cc91df 100644 --- a/pkgs/applications/virtualization/virter/default.nix +++ b/pkgs/applications/virtualization/virter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "virter"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "LINBIT"; repo = "virter"; rev = "v${version}"; - hash = "sha256-Ae7lQveslZ4XqMmnC5mkZOk/8WSLXpmeRjkYUkIaasg="; + hash = "sha256-sfO704nZnsSpSokJUwc3ucPBlKIi3cbZUG1dwbKDnFw="; }; - vendorHash = "sha256-7aWrY9EMTaJrNd0MTFIMfyUJ67I0LtndqNH0INo/OfA="; + vendorHash = "sha256-NmA1rLWSX03zurGZWvXv61TSB9hecEfi7Hx9yi7QL/c="; ldflags = [ "-s" diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index df2094c3b1fca..314d8136b852c 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchpatch, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook +{ config, stdenv, fetchurl, fetchpatch, callPackage, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU , libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 @@ -35,6 +35,8 @@ let # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. withModsrc = !enableKvm; + + virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -116,11 +118,11 @@ in stdenv.mkDerivation { # we don't take any chances and only apply it if people actually want to use KVM support. ++ optional enableKvm (fetchpatch (let - patchVersion = "20240226"; + patchVersion = "20240325"; in { name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch"; - url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/virtualbox-${version}-kvm-dev-${patchVersion}.patch"; - hash = "sha256-3YT1ZN/TwoNWNb2eqOcPF8GTrVGfOPaPb8vpGoPNISY="; + url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch"; + hash = "sha256-D1ua8X5Iyw/I89PtskiGdnGr4NhdFtI93ThltiOcu8w="; })) ++ [ ./qt-dependency-paths.patch @@ -249,7 +251,7 @@ in stdenv.mkDerivation { mkdir -p "$out/share/virtualbox" cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" - ln -s "${linuxPackages.virtualboxGuestAdditions.src}" "$out/share/virtualbox/VBoxGuestAdditions.iso" + ln -s "${virtualboxGuestAdditionsIso}/VBoxGuestAdditions_${version}.iso" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; preFixup = optionalString (!headless) '' @@ -262,7 +264,6 @@ in stdenv.mkDerivation { ''; passthru = { - inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc updateScript = ./update.sh; }; @@ -281,7 +282,7 @@ in stdenv.mkDerivation { ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander friedrichaltheide ]; + maintainers = with maintainers; [ sander friedrichaltheide blitz ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix new file mode 100644 index 0000000000000..d2f9bc62ba18b --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, lib, virtualbox}: + +let + inherit (virtualbox) version; +in +stdenv.mkDerivation rec { + pname = "VirtualBox-GuestAdditions-iso"; + inherit version; + + src = fetchurl { + url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; + sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; + }; + + buildCommand = '' + mkdir -p $out + cp $src $out/ + ''; + + meta = { + description = "Guest additions ISO for VirtualBox"; + longDescription = '' + ISO containing various add-ons which improves guests inside VirtualBox. + ''; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix new file mode 100644 index 0000000000000..298acba8439de --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -0,0 +1,133 @@ +{ config, stdenv, kernel, fetchurl, lib, pam, libxslt +, libX11, libXext, libXcursor, libXmu +, glib, alsa-lib, libXrandr, dbus +, pkg-config, which, zlib, xorg +, yasm, patchelf, makeWrapper, makeself, nasm +, linuxHeaders, openssl, libpulseaudio}: + +with lib; + +let + buildType = "release"; + +in stdenv.mkDerivation (finalAttrs: { + pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; + version = "7.0.14"; + + src = fetchurl { + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2"; + sha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"; + }; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; + + nativeBuildInputs = [ patchelf makeWrapper pkg-config which yasm ]; + buildInputs = kernel.moduleBuildDependencies ++ [ libxslt libX11 libXext libXcursor + glib nasm alsa-lib makeself pam libXmu libXrandr linuxHeaders openssl libpulseaudio xorg.xorgserver ]; + + KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; + + prePatch = '' + rm -r src/VBox/Additions/x11/x11include/ + rm -r src/libs/openssl-*/ + rm -r src/libs/curl-*/ + ''; + + patches = [ + ../gcc-13.patch + # https://www.virtualbox.org/changeset/100258/vbox + ./no-legacy-xorg.patch + # https://www.virtualbox.org/changeset/102989/vbox + ./strlcpy-1.patch + # https://www.virtualbox.org/changeset/102990/vbox + ./strlcpy-2.patch + ]; + + postPatch = '' + set -x + sed -e 's@MKISOFS --version@MKISOFS -version@' \ + -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++17 \1"@' \ + -i configure + ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 + ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 + + substituteInPlace ./include/VBox/dbus-calls.h --replace-fail libdbus-1.so.3 ${dbus.lib}/lib/libdbus-1.so.3 + + substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxDRMClient /run/current-system/sw/bin/VBoxDRMClient + substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxClient /run/current-system/sw/bin/VBoxClient + substituteInPlace ./src/VBox/Additions/x11/VBoxClient/display.cpp --replace-fail /usr/X11/bin/xrandr ${xorg.xrandr}/bin/xrandr + substituteInPlace ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --replace-fail /usr/include/xorg "${xorg.xorgserver.dev}/include/xorg " + ''; + + configurePhase = '' + NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed 's,\-isystem ${lib.getDev stdenv.cc.libc}/include,,g') + + cat >> LocalConfig.kmk <<LOCAL_CONFIG + VBOX_WITH_TESTCASES := + VBOX_WITH_TESTSUITE := + VBOX_WITH_VALIDATIONKIT := + VBOX_WITH_DOCS := + VBOX_WITH_WARNINGS_AS_ERRORS := + + VBOX_WITH_ORIGIN := + VBOX_PATH_APP_PRIVATE_ARCH_TOP := $out/share/virtualbox + VBOX_PATH_APP_PRIVATE_ARCH := $out/libexec/virtualbox + VBOX_PATH_SHARED_LIBS := $out/libexec/virtualbox + VBOX_WITH_RUNPATH := $out/libexec/virtualbox + VBOX_PATH_APP_PRIVATE := $out/share/virtualbox + VBOX_PATH_APP_DOCS := $out/doc + + VBOX_USE_SYSTEM_XORG_HEADERS := 1 + VBOX_USE_SYSTEM_GL_HEADERS := 1 + VBOX_NO_LEGACY_XORG_X11 := 1 + + SDK_VBoxOpenSslStatic_INCS := ${openssl.dev}/include/ssl + + VBOX_ONLY_ADDITIONS := 1 + VBOX_WITH_SHARED_CLIPBOARD := 1 + VBOX_WITH_GUEST_PROPS := 1 + VBOX_WITH_VMSVGA := 1 + VBOX_WITH_SHARED_FOLDERS := 1 + VBOX_WITH_GUEST_CONTROL := 1 + VBOX_WITHOUT_LINUX_GUEST_PACKAGE := 1 + VBOX_WITH_PAM := + + VBOX_BUILD_PUBLISHER := _NixOS + LOCAL_CONFIG + + ./configure \ + --only-additions \ + --with-linux=${kernel.dev} \ + --disable-kmods + + sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${glib.dev}/lib/pkgconfig @' \ + -i AutoConfig.kmk + sed -e 's@arch/x86/@@' \ + -i Config.kmk + + export USER=nix + set +x + ''; + + enableParallelBuilding = true; + + buildPhase = '' + runHook preBuild + + source env.sh + VBOX_ONLY_ADDITIONS=1 VBOX_ONLY_BUILD=1 kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" + VBOX_ONLY_ADDITIONS=1 VBOX_ONLY_BUILD=1 kmk packing + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -rv ./out/linux.${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}/${buildType}/bin/additions/VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2 $out/ + + runHook postInstall + ''; +}) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index a1c2c8d09e24e..ce23538ffc38e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper -, zlib, xorg, dbus, virtualbox}: +{ config, stdenv, kernel, callPackage, lib, dbus +, libX11, libXext, libXcursor, libXmu, xorg +, which, zlib, patchelf, makeWrapper +}: + +with lib; let - version = virtualbox.version; - xserverVListFunc = builtins.elemAt (lib.splitVersion xorg.xorgserver.version); + virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { }; # Forced to 1.18; vboxvideo doesn't seem to provide any newer ABI, # and nixpkgs doesn't support older ABIs anymore. @@ -17,137 +20,94 @@ let { name = "libXfixes.so"; pkg = xorg.libXfixes; } { name = "libXrandr.so"; pkg = xorg.libXrandr; } ]; +in stdenv.mkDerivation { + pname = "VirtualBox-GuestAdditions"; + version = "${virtualBoxNixGuestAdditionsBuilder.version}-${kernel.version}"; + + src = "${virtualBoxNixGuestAdditionsBuilder}/VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2"; + sourceRoot = "."; + + KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; + + hardeningDisable = [ "pic" ]; + + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; + + nativeBuildInputs = [ patchelf makeWrapper ]; + buildInputs = [ virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; + + buildPhase = '' + runHook preBuild + + # Build kernel modules. + cd src + find . -type f | xargs sed 's/depmod -a/true/' -i + cd vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + # Run just make first. If we only did make install, we get symbol warnings during build. + make + cd ../.. + + # Change the interpreter for various binaries + for i in sbin/VBoxService bin/{VBoxClient,VBoxControl,VBoxDRMClient} other/mount.vboxsf; do + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} $i + patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc zlib + xorg.libX11 xorg.libXt xorg.libXext xorg.libXmu xorg.libXfixes xorg.libXcursor ]} $i + done -in stdenv.mkDerivation rec { - name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; - - src = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; - }; - - KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; - - hardeningDisable = [ "pic" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - - nativeBuildInputs = [ patchelf makeWrapper ]; - buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; - - - prePatch = '' - substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \ - --replace "<ttm/" "<drm/ttm/" - ''; - - patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ]; - - unpackPhase = '' - isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run - chmod 755 ./VBoxLinuxAdditions.run - # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is - sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run - ./VBoxLinuxAdditions.run --noexec --keep - - # Unpack files - cd install - tar xfvj VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2 - ''; - - buildPhase = '' - # Build kernel modules. - cd src - find . -type f | xargs sed 's/depmod -a/true/' -i - cd vboxguest-${version} - # Run just make first. If we only did make install, we get symbol warnings during build. - make - cd ../.. - - # Change the interpreter for various binaries - for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} other/mount.vboxsf; do - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} $i - patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc zlib - xorg.libX11 xorg.libXt xorg.libXext xorg.libXmu xorg.libXfixes xorg.libXrandr xorg.libXcursor ]} $i - done - - for i in lib/VBoxOGL*.so - do - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" - xorg.libXcomposite xorg.libXdamage xorg.libXext xorg.libXfixes ]} $i - done - - # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions - # NixOS module) to 98vboxadd-xclient. For now, just work around it: - mv other/98vboxadd-xclient bin/VBoxClient-all - - # Remove references to /usr from various scripts and files - sed -i -e "s|/usr/bin|$out/bin|" other/vboxclient.desktop - sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all - ''; - - installPhase = '' - # Install kernel modules. - cd src/vboxguest-${version} - make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers - cd ../.. - - # Install binaries - install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf - install -D -m 755 sbin/VBoxService $out/bin/VBoxService - - mkdir -p $out/bin - install -m 755 bin/VBoxClient $out/bin - install -m 755 bin/VBoxControl $out/bin - install -m 755 bin/VBoxClient-all $out/bin - - wrapProgram $out/bin/VBoxClient-all \ - --prefix PATH : "${which}/bin" - - # Don't install VBoxOGL for now - # It seems to be broken upstream too, and fixing it is far down the priority list: - # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html - # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from - # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd - # either. (#18457) - ## Install OpenGL libraries - #mkdir -p $out/lib - #cp -v lib/VBoxOGL*.so $out/lib - #mkdir -p $out/lib/dri - #ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so - - # Install desktop file - mkdir -p $out/etc/xdg/autostart - cp -v other/vboxclient.desktop $out/etc/xdg/autostart - - # Install Xorg drivers - mkdir -p $out/lib/xorg/modules/{drivers,input} - install -m 644 other/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so - ''; - - # Stripping breaks these binaries for some reason. - dontStrip = true; - - # Patch RUNPATH according to dlopenLibs (see the comment there). - postFixup = lib.concatMapStrings (library: '' - for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do - origRpath=$(patchelf --print-rpath "$i") - patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i" - done - '') dlopenLibs; - - meta = { - description = "Guest additions for VirtualBox"; - longDescription = '' - Various add-ons which makes NixOS work better as guest OS inside VirtualBox. - This add-on provides support for dynamic resizing of the X Display, shared - host/guest clipboard support and guest OpenGL support. + runHook postBuild ''; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = "GPL"; - maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); - }; -} + + installPhase = '' + runHook preInstall + + # Install kernel modules. + cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers + cd ../.. + + # Install binaries + install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf + install -D -m 755 sbin/VBoxService $out/bin/VBoxService + + mkdir -p $out/bin + install -m 755 bin/VBoxClient $out/bin + install -m 755 bin/VBoxControl $out/bin + install -m 755 bin/VBoxDRMClient $out/bin + + + # Don't install VBoxOGL for now + # It seems to be broken upstream too, and fixing it is far down the priority list: + # https://www.virtualbox.org/pipermail/vbox-dev/2017-June/014561.html + # Additionally, 3d support seems to rely on VBoxOGL.so being symlinked from + # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd + # either. (#18457) + + runHook postInstall + ''; + + # Stripping breaks these binaries for some reason. + dontStrip = true; + + # Patch RUNPATH according to dlopenLibs (see the comment there). + postFixup = lib.concatMapStrings (library: '' + for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do + origRpath=$(patchelf --print-rpath "$i") + patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i" + done + '') dlopenLibs; + + meta = { + description = "Guest additions for VirtualBox"; + longDescription = '' + Various add-ons which makes NixOS work better as guest OS inside VirtualBox. + This add-on provides support for dynamic resizing of the virtual display, shared + host/guest clipboard support. + ''; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + license = licenses.gpl2; + maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); + }; + } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/no-legacy-xorg.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/no-legacy-xorg.patch new file mode 100644 index 0000000000000..911cf0f0d5f0f --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/no-legacy-xorg.patch @@ -0,0 +1,45 @@ +# https://www.virtualbox.org/changeset/100258/vbox +diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk +index 0921b3fe619..de9e98b4989 100644 +--- a/src/VBox/Additions/linux/Makefile.kmk ++++ b/src/VBox/Additions/linux/Makefile.kmk +@@ -136,23 +136,29 @@ VBOX_LNX_ADD_STRIP_SBIN += \ + $(if $(VBOX_WITH_LIGHTDM_GREETER),vbox-greeter) + + VBOX_LNX_ADD_STRIP_MOD = \ +- vboxmouse_drv_70.so \ +- vboxmouse_drv_71.so \ +- vboxmouse_drv_13.so \ +- vboxmouse_drv_14.so \ +- vboxmouse_drv_15.so \ +- vboxmouse_drv_16.so \ +- $(addsuffix .so,$(filter-out %_32,$(filter vboxvideo_drv_%,$(DLLS)))) \ + $(if $(VBOX_WITH_PAM),pam_vbox.so,) \ + mount.vboxsf + ++ifndef VBOX_NO_LEGACY_XORG_X11 ++ VBOX_LNX_ADD_STRIP_MOD += \ ++ vboxmouse_drv_70.so \ ++ vboxmouse_drv_71.so \ ++ vboxmouse_drv_13.so \ ++ vboxmouse_drv_14.so \ ++ vboxmouse_drv_15.so \ ++ vboxmouse_drv_16.so \ ++ $(addsuffix .so,$(filter-out %_32,$(filter vboxvideo_drv_%,$(DLLS)))) ++endif ++ + VBOX_LNX_ADD_MOD = \ + 98vboxadd-xclient \ + x11config.sh + +-VBOX_LNX_ADD_STRIP_OBJ = \ +- vboxmouse_drv.o \ +- vboxvideo_drv.o ++ifndef VBOX_NO_LEGACY_XORG_X11 ++ VBOX_LNX_ADD_STRIP_OBJ = \ ++ vboxmouse_drv.o \ ++ vboxvideo_drv.o ++endif + + VBOX_LNX_ADD_INIT = \ + vboxadd \ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-1.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-1.patch new file mode 100644 index 0000000000000..642f5864d2082 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-1.patch @@ -0,0 +1,29 @@ +# https://www.virtualbox.org/changeset/102989/vbox +--- a/include/iprt/string.h ++++ b/include/iprt/string.h +@@ -244,4 +244,26 @@ + #else /* !RT_OS_LINUX && !__KERNEL__ */ + # define RT_BCOPY_UNFORTIFIED(a_pDst, a_pSrc, a_cbToCopy) memcpy((a_pDst), (a_pSrc), (a_cbToCopy)) ++#endif /* !RT_OS_LINUX && !__KERNEL__ */ ++ ++/** @def RT_STRSCPY ++ * Copy string and NULL-terminate output buffer. ++ * ++ * This macro should mostly be used in Linux kernel code. This is ++ * the replacement for deprecated strlcpy. It was deprecated since 3.16.60 ++ * when strscpy was introduced as an alternative. Finally, strlcpy was ++ * completely removed from kernel code in 6.8.0. ++ * ++ * @param a_pDst Pointer to the destination string buffer. ++ * @param a_pSrc Pointer to the source NULL-terminated string buffer. ++ * @param a_cbToCopy Size of destination buffer.. ++ */ ++#if defined(RT_OS_LINUX) && defined(__KERNEL__) ++# if (RTLNX_VER_MIN(3,16,60)) ++# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) ++# else /* < 3.16.60 */ ++# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strlcpy((a_pDst), (a_pSrc), (a_cbToCopy)) ++# endif ++#else /* !RT_OS_LINUX && !__KERNEL__ */ ++# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy) strscpy((a_pDst), (a_pSrc), (a_cbToCopy)) + #endif /* !RT_OS_LINUX && !__KERNEL__ */ diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-2.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-2.patch new file mode 100644 index 0000000000000..15e546f89e79c --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/strlcpy-2.patch @@ -0,0 +1,86 @@ +# https://www.virtualbox.org/changeset/102990/vbox +--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c ++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +@@ -1411,5 +1411,5 @@ + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); ++ RT_STRSCPY(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp)); + + return 0; +@@ -1437,5 +1437,5 @@ + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); ++ RT_STRSCPY(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags)); + return 0; + } +@@ -1462,5 +1462,5 @@ + } + else if (pParam->name[0] != 'd') +- strlcpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); ++ RT_STRSCPY(&g_szLogDst[0], pszValue, sizeof(g_szLogDst)); + return 0; + } + +# https://www.virtualbox.org/changeset/102990/vbox +--- a/src/VBox/Additions/linux/drm/vbox_drv.h ++++ b/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -539,7 +539,5 @@ + void vbox_irq_fini(struct vbox_private *vbox); + void vbox_report_hotplug(struct vbox_private *vbox); +-#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1) && !RTLNX_SUSE_MAJ_PREREQ(15,5) + irqreturn_t vbox_irq_handler(int irq, void *arg); +-#endif + + /* vbox_hgsmi.c */ + +# https://www.virtualbox.org/changeset/102990/vbox +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -3506,5 +3506,5 @@ + + /** file_operations::mmap wrapper for logging purposes. */ +-extern int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma) ++static int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma) + { + int rc; +@@ -3787,5 +3787,5 @@ + + # if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(9,3, 9,99) +-int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, ++static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, + unsigned len, struct page **pagep, void **fsdata) + { +@@ -3794,5 +3794,5 @@ + } + # else +-int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, ++static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos, + unsigned len, unsigned flags, struct page **pagep, void **fsdata) + { + +# https://www.virtualbox.org/changeset/102990/vbox +--- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c ++++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c +@@ -1409,5 +1409,5 @@ + case Opt_iocharset: + case Opt_nls: +- strlcpy(info->nls_name, param->string, sizeof(info->nls_name)); ++ RT_STRSCPY(info->nls_name, param->string, sizeof(info->nls_name)); + break; + case Opt_uid: +@@ -1470,5 +1470,5 @@ + break; + case Opt_tag: +- strlcpy(info->szTag, param->string, sizeof(info->szTag)); ++ RT_STRSCPY(info->szTag, param->string, sizeof(info->szTag)); + break; + default: +@@ -1529,5 +1529,5 @@ + + /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */ +- strlcpy(info->name, fc->source, sizeof(info->name)); ++ RT_STRSCPY(info->name, fc->source, sizeof(info->name)); + + # if RTLNX_VER_MAX(5,3,0) diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index fcd02ae8a27b6..5269f85ee9389 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -24,20 +24,25 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then virtualBoxShaSum=$(fileShaSum "$shaSums" "VirtualBox-$latestVersion.tar.bz2") extpackShaSum=$(fileShaSum "$shaSums" "Oracle_VM_VirtualBox_Extension_Pack-$latestVersion.vbox-extpack") - guestAdditionsShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso") + guestAdditionsIsoShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso") virtualboxNixFile=$(nixFile ${attr}) extpackNixFile=$(nixFile ${attr}Extpack) - guestAdditionsNixFile=$(nixFile linuxPackages.${attr}GuestAdditions) + guestAdditionsIsoNixFile="pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix" + virtualboxGuestAdditionsNixFile="pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix" + virtualBoxOldShaSum=$(oldHash ${attr}Extpack) extpackOldShaSum=$(oldHash ${attr}Extpack) - guestAdditionsOldShaSum=$(oldHash linuxPackages.${attr}GuestAdditions.src) update-source-version $attr $latestVersion $virtualBoxShaSum sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile - sed -i -e 's|sha256 = "'$guestAdditionsOldShaSum'"|sha256 = "'$guestAdditionsShaSum'"|' $guestAdditionsNixFile + sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ + -i $guestAdditionsIsoNixFile + sed -e "s/version =.*;/version = \"$latestVersion\";/g" \ + -e "s/sha256 =.*;/sha256 = \"$virtualBoxShaSum\";/g" \ + -i $virtualboxGuestAdditionsNixFile - git add $virtualboxNixFile $extpackNixFile $guestAdditionsNixFile + git add $virtualboxNixFile $extpackNixFile $guestAdditionsIsoNixFile $virtualboxGuestAdditionsNixFile git commit -m "$attr: ${oldVersion} -> ${latestVersion}" else echo "$attr is already up-to-date" diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 09cddc31a748b..25fcad2ba0b6c 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.0"; + version = "2.1"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-wuEsfzy4L40tL/Lb5R1jMFa8UAvAqkI3iEd//D7lxGY="; + hash = "sha256-bUt4Se4Gu7CZEdv1/VpU92ncq2MBKXG7T4Wpa/2rocI="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 24b011040ae4e..0905e3f15150e 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,12 +1,15 @@ -{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, writeText, patches ? [ ], conf ? null +# update script dependencies +, gitUpdater +}: stdenv.mkDerivation rec { pname = "dwm"; - version = "6.4"; + version = "6.5"; src = fetchurl { url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz"; - sha256 = "sha256-+pwNaaWESFB2z8GICf1wXlwggNr7E9XnKaNkbKdwOm4="; + sha256 = "sha256-Ideev6ny+5MUGDbCZmy4H0eExp1k5/GyNS+blwuglyk="; }; buildInputs = [ libX11 libXinerama libXft ]; @@ -29,6 +32,10 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + passthru.updateScript = gitUpdater { + url = "git://git.suckless.org/dwm"; + }; + meta = with lib; { homepage = "https://dwm.suckless.org/"; description = "An extremely fast, small, and dynamic window manager for X"; diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix deleted file mode 100644 index e771a170c4894..0000000000000 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libXcursor -, libXft -, libXinerama -, libXpm -, libXt -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, enableGestures ? false -}: - -stdenv.mkDerivation rec { - pname = "fvwm"; - version = "2.7.0"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = pname; - rev = version; - hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libXcursor - libXft - libXinerama - libXpm - libXt - libpng - librsvg - libxslt - perl - python3Packages.python - readline - ] ++ lib.optional enableGestures libstroke; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - "--disable-htmldoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ edanaher ]; - }; -} diff --git a/pkgs/applications/window-managers/fvwm/3.nix b/pkgs/applications/window-managers/fvwm/3.nix deleted file mode 100644 index 31d29af44d80a..0000000000000 --- a/pkgs/applications/window-managers/fvwm/3.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, asciidoctor -, autoreconfHook -, cairo -, fontconfig -, freetype -, fribidi -, libSM -, libX11 -, libXcursor -, libXft -, libXi -, libXinerama -, libXpm -, libXrandr -, libXt -, libevent -, libintl -, libpng -, librsvg -, libstroke -, libxslt -, perl -, pkg-config -, python3Packages -, readline -, sharutils -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "fvwm3"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = "fvwm3"; - rev = finalAttrs.version; - hash = "sha256-SjAccEAQsrzfVCtesqULONmb9TLD5IF8uIwEX3UhrxU="; - }; - - nativeBuildInputs = [ - autoreconfHook - asciidoctor - pkg-config - python3Packages.wrapPython - ]; - - buildInputs = [ - cairo - fontconfig - freetype - fribidi - libSM - libX11 - libXcursor - libXft - libXi - libXinerama - libXpm - libXrandr - libXt - libevent - libintl - libpng - librsvg - libstroke - libxslt - perl - python3Packages.python - readline - sharutils - ]; - - pythonPath = [ - python3Packages.pyxdg - ]; - - configureFlags = [ - "--enable-mandoc" - ]; - - postFixup = '' - wrapPythonPrograms - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager - Version 3"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (libX11.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix deleted file mode 100644 index a0dd62ab94941..0000000000000 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ stdenv -, fetchFromGitHub -, meson -, pkg-config -, ninja -, xorg -, libdrm -, vulkan-loader -, vulkan-headers -, wayland -, wayland-protocols -, libxkbcommon -, glm -, gbenchmark -, libcap -, libavif -, SDL2 -, pipewire -, pixman -, libinput -, glslang -, hwdata -, openvr -, stb -, wlroots -, libliftoff -, libdisplay-info -, lib -, makeBinaryWrapper -, nix-update-script -, enableExecutable ? true -, enableWsi ? true -}: -let - joshShaders = fetchFromGitHub { - owner = "Joshua-Ashton"; - repo = "GamescopeShaders"; - rev = "v0.1"; - hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA="; - }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "gamescope"; - version = "3.14.2"; - - src = fetchFromGitHub { - owner = "ValveSoftware"; - repo = "gamescope"; - rev = "refs/tags/${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-Ym1kl9naAm1MGlxCk32ssvfiOlstHiZPy7Ga8EZegus="; - }; - - patches = [ - # Unvendor dependencies - ./use-pkgconfig.patch - - # Make it look for shaders in the right place - ./shaders-path.patch - ]; - - # We can't substitute the patch itself because substituteAll is itself a derivation, - # so `placeholder "out"` ends up pointing to the wrong place - postPatch = '' - substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out" - ''; - - mesonFlags = [ - (lib.mesonBool "enable_gamescope" enableExecutable) - (lib.mesonBool "enable_gamescope_wsi_layer" enableWsi) - ]; - - # don't install vendored vkroots etc - mesonInstallFlags = ["--skip-subprojects"]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - pkg-config - ninja - ] ++ lib.optionals enableExecutable [ - makeBinaryWrapper - glslang - ]; - - buildInputs = [ - pipewire - hwdata - xorg.libX11 - wayland - wayland-protocols - vulkan-loader - openvr - glm - ] ++ lib.optionals enableWsi [ - vulkan-headers - ] ++ lib.optionals enableExecutable [ - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXi - xorg.libXmu - xorg.libXrender - xorg.libXres - xorg.libXtst - xorg.libXxf86vm - libavif - libdrm - libliftoff - SDL2 - wlroots - libinput - libxkbcommon - gbenchmark - pixman - libcap - stb - libdisplay-info - ]; - - postInstall = lib.optionalString enableExecutable '' - # --debug-layers flag expects these in the path - wrapProgram "$out/bin/gamescope" \ - --prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]} - - # Install ReShade shaders - mkdir -p $out/share/gamescope/reshade - cp -r ${joshShaders}/* $out/share/gamescope/reshade/ - ''; - - passthru.updateScript = nix-update-script {}; - - meta = with lib; { - description = "SteamOS session compositing window manager"; - homepage = "https://github.com/ValveSoftware/gamescope"; - license = licenses.bsd2; - maintainers = with maintainers; [ nrdxp pedrohlc Scrumplex zhaofengli k900 ]; - platforms = platforms.linux; - mainProgram = "gamescope"; - }; -}) diff --git a/pkgs/applications/window-managers/gamescope/shaders-path.patch b/pkgs/applications/window-managers/gamescope/shaders-path.patch deleted file mode 100644 index bbdaf21a2e6fb..0000000000000 --- a/pkgs/applications/window-managers/gamescope/shaders-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/reshade_effect_manager.cpp b/src/reshade_effect_manager.cpp -index 3597ca1..de45250 100644 ---- a/src/reshade_effect_manager.cpp -+++ b/src/reshade_effect_manager.cpp -@@ -34,7 +34,7 @@ static std::string GetLocalUsrDir() - - static std::string GetUsrDir() - { -- return "/usr"; -+ return "@out@"; - } - - static LogScope reshade_log("gamescope_reshade"); diff --git a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch deleted file mode 100644 index 2b4de54ae54df..0000000000000 --- a/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -6,7 +6,6 @@ project( - default_options: [ - 'cpp_std=c++20', - 'warning_level=2', -- 'force_fallback_for=wlroots,libliftoff,vkroots', - ], - ) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix deleted file mode 100644 index 508f13f985b24..0000000000000 --- a/pkgs/applications/window-managers/hikari/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchzip -, pkg-config, bmake -, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman -, libucl, wayland, wayland-protocols, wlroots, mesa -, features ? { - gammacontrol = true; - layershell = true; - screencopy = true; - xwayland = true; - } -}: - -stdenv.mkDerivation rec { - pname = "hikari"; - version = "2.3.3"; - - src = fetchzip { - url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-5Ug0U3ESC5F/gj7bahnLYkeY/weSCj0QASwdFuWwdMI="; - }; - - nativeBuildInputs = [ pkg-config bmake ]; - - buildInputs = [ - cairo - glib - libevdev - libinput - libxkbcommon - linux-pam - pango - pixman - libucl - mesa # for libEGL - wayland - wayland-protocols - wlroots - ]; - - enableParallelBuilding = true; - - makeFlags = with lib; [ "PREFIX=$(out)" ] - ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" - ++ mapAttrsToList (feat: enabled: - optionalString enabled "WITH_${toUpper feat}=YES" - ) features; - - postPatch = '' - # Can't suid in nix store - # Run hikari as root (it will drop privileges as early as possible), or create - # a systemd unit to give it the necessary permissions/capabilities. - substituteInPlace Makefile --replace '4555' '555' - - sed -i 's@<drm_fourcc.h>@<libdrm/drm_fourcc.h>@' src/*.c - ''; - - meta = with lib; { - description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; - homepage = "https://hikari.acmelabs.space"; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.freebsd; - maintainers = with maintainers; [ jpotier ]; - }; -} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 3db57a6b8dd21..e8da21dba912b 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -8,6 +8,7 @@ , binutils , cairo , git +, hyprcursor , hyprland-protocols , hyprlang , jq @@ -22,11 +23,11 @@ , pciutils , systemd , tomlplusplus -, udis86 +, udis86-hyprland , wayland , wayland-protocols , wayland-scanner -, wlroots +, wlroots-hyprland , xcbutilwm , xwayland , debug ? false @@ -42,15 +43,19 @@ assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; + +let + wlr = wlroots-hyprland.override { inherit enableXWayland; }; +in stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.36.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U="; + hash = "sha256-6y422rx8ScSkjR1dNYGYUxBmFewRYlCz9XZZ+XrVZng="; }; patches = [ @@ -68,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "@HASH@" '${finalAttrs.src.rev}' \ --replace "@BRANCH@" "" \ --replace "@MESSAGE@" "" \ - --replace "@DATE@" "2024-02-05" \ + --replace "@DATE@" "2024-04-06" \ --replace "@TAG@" "" \ --replace "@DIRTY@" "" ''; @@ -92,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { [ cairo git + hyprcursor hyprland-protocols hyprlang libGL @@ -99,13 +105,13 @@ stdenv.mkDerivation (finalAttrs: { libinput libxkbcommon mesa - udis86 + udis86-hyprland wayland wayland-protocols pango pciutils tomlplusplus - wlroots + wlr ] ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] @@ -125,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots + ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots ${lib.optionalString wrapRuntimeDeps '' wrapProgram $out/bin/Hyprland \ --suffix PATH : ${lib.makeBinPath [binutils pciutils stdenv.cc]} @@ -135,11 +141,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.providedSessions = [ "hyprland" ]; meta = with lib; { - homepage = "https://github.com/vaxerski/Hyprland"; + homepage = "https://github.com/hyprwm/Hyprland"; description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot fufexan ]; mainProgram = "Hyprland"; - platforms = wlroots.meta.platforms; + platforms = wlr.meta.platforms; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 1aef74294bd5f..53113b3e8bffd 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -22,15 +22,15 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland rec { + mkHyprlandPlugin hyprland { pluginName = "hy3"; - version = "0.36.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl${version}"; - hash = "sha256-nRBeHh0Vr0gB3BHiqP9ZE4/yyZvRt8jJHwBF5lFu/24="; + rev = "hl0.38.0"; + hash = "sha256-ZVwX5yM97R6MLk64dQG5KqYOR4L4HxEEV+xzQi+NGrk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index 5c42eff6fc8c6..d5be9f276cf25 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,16 +1,18 @@ { fetchFromGitLab , wlroots +, enableXWayland ? true }: wlroots.overrideAttrs (old: { + inherit enableXWayland; version = "0.18.0-dev"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5"; - hash = "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI="; + rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"; + hash = "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8="; }; patches = [ ]; # don't inherit old.patches diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix index 229f53ed3de8f..0393c6eddd3ba 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -4,6 +4,8 @@ , hatchling , more-itertools , click +, hyprland +, makeWrapper }: buildPythonPackage rec { @@ -20,10 +22,17 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling + makeWrapper ]; propagatedBuildInputs = [ more-itertools click ]; + postFixup = '' + wrapProgram $out/bin/hyprshade \ + --set HYPRSHADE_SHADERS_DIR $out/share/hyprshade/shaders \ + --prefix PATH : ${lib.makeBinPath [ hyprland ]} + ''; + meta = with lib; { homepage = "https://github.com/loqusion/hyprshade"; description = "Hyprland shade configuration tool"; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 74635d1588298..b9ced38b5fe4c 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DIEWmXqs4yNIJsBBhH7khOY6RJQ9qRoSTIHN/aeBuA4="; + hash = "sha256-9lzzjb6tDfgqjAT9mS/cWfC6ucNXoJ8JJwtZ0FZqlDA="; }; - cargoHash = "sha256-5946aMSndBkXCY0jjnhPc5x9wFOC1zjJNkFkMFFOuxo="; + cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index 4c73135c54a46..7e59995126fad 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 = "unstable-2024-03-15"; + version = "unstable-2024-04-16"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "dcc44916d0b25dd06d792947c837cf4cd8c24925"; - hash = "sha256-LnqhIVmC5F+FAIcYW+oT4t2ovRWeoV4zHpvbNhiY7Kw="; + rev = "d7f43ac201e6f1aa7aeee668f5d16683f48917f1"; + hash = "sha256-hUTK7kd7gTvms4HMF7BgYWomRYZyRkqUfjhVtEF+YRE="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5a6ca17caf696..853ceb8a083b9 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.36.0"; + version = "0.37.1"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-rhhvVCOqw/jqNSpo9Hlrcgh4Bxnoud/Z3yAq4n/ixIQ="; + hash = "sha256-74H4GLFIIs97iVE8IWPxS9hALkBGkcKmrMe6/uxtPuM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 8e85597cc7d39..0635d7a5e407e 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,11 +1,12 @@ { lib , stdenv , fetchurl +, nixosTests , directoryListingUpdater , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , feedbackd , gtk4 @@ -20,12 +21,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.37.0"; + version = "0.38.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-HW3wM/lb8pvr+eDoeqa0iHXiKhBQ8ybBIy0wwHPsrOg="; + hash = "sha256-WDqgVsJx5y6IlWII9fRBsAeWn/tB8BaXRtlPvA0wmMk="; }; nativeBuildInputs = [ @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { ninja phosh pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -59,7 +60,10 @@ stdenv.mkDerivation rec { ln -s '${phosh}/lib/phosh' "$out/lib/phosh" ''; - passthru.updateScript = directoryListingUpdater { }; + passthru = { + tests.phosh = nixosTests.phosh; + updateScript = directoryListingUpdater { }; + }; meta = with lib; { description = "A settings app for mobile specific things"; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 4c59222d31bb5..3d3008692922b 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea , libGL , libX11 , libevdev @@ -12,7 +12,7 @@ , udev , wayland , wayland-protocols -, wlroots_0_16 +, wlroots_0_17 , xwayland , zig_0_11 , withManpages ? true @@ -21,16 +21,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "river"; - version = "0.2.6"; + version = "0.3.0"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; - src = fetchFromGitHub { - owner = "riverwm"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "river"; repo = "river"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-JPb8l5ANxYCqinWNoQK5PAyn4CaiSj0e9mAhZwd9HOw="; + hash = "sha256-6LZuWx0sC6bW0K7D0PR8hJlVW6i6NIzOOORdMu3Gk5U="; }; nativeBuildInputs = [ @@ -49,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pixman udev wayland-protocols - wlroots_0_16 + wlroots_0_17 ] ++ lib.optional xwaylandSupport libX11; dontConfigure = true; @@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.providedSessions = [ "river" ]; meta = { - homepage = "https://github.com/ifreund/river"; + homepage = "https://codeberg.org/river/river"; description = "A dynamic tiling wayland compositor"; longDescription = '' River is a dynamic tiling Wayland compositor with flexible runtime @@ -79,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { - Scriptable configuration and control through a custom Wayland protocol and separate riverctl binary implementing it. ''; - changelog = "https://github.com/ifreund/river/releases/tag/v${finalAttrs.version}"; + changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ adamcstephens diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 12c2e5da1b984..f0b9407761283 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchzip, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchzip +, meson, ninja, pkg-config, python3, python3Packages, wayland-scanner , libxkbcommon, mesa, pixman, xorg, wayland, gtest }: stdenv.mkDerivation { pname = "sommelier"; - version = "104.0"; + version = "123.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "af5434fd9903936a534e1316cbd22361e67949ec"; + passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6"; stripRoot = false; - sha256 = "LungQqHQorHIKpye2SDBLuMHPt45C1cPYcs9o5Hc3cw="; + sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ + meson ninja pkg-config python3 python3Packages.jinja2 wayland-scanner + ]; buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + preConfigure = '' + patchShebangs gen-shim.py + ''; + doCheck = true; nativeCheckInputs = [ gtest ]; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index ef0fd7efdc395..068d5c2f82edb 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tabbed"; - version = "0.7"; + version = "0.8"; src = fetchgit { url = "https://git.suckless.org/tabbed"; rev = finalAttrs.version; - hash = "sha256-Y1MgPwqMUoa2Rr4HmqjtPaQegUmQJWYkcbyFcJHAOBI="; + hash = "sha256-KpMWBnnoF4AGRKrG30NQsVt0CFfJXVdlXLLag0Dq0sU="; }; inherit patches; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index c633b19abc709..e6ed87ffabd32 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, nixosTests , cmake , meson , ninja @@ -26,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-YI8N1rY71b2ulv7tAdah7sibG4qq3kY0/hyS0cls5to="; + hash = "sha256-OPGzPy0I6i3TvmA5KSWDb4Lsf66zM5X+Akckgs3wk2o="; }; nativeBuildInputs = [ @@ -44,7 +45,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wf-config libGL libdrm libexecinfo @@ -54,14 +54,15 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon wayland-protocols xorg.xcbutilwm - wayland - cairo - pango nlohmann_json ]; propagatedBuildInputs = [ + wf-config wlroots + wayland + cairo + pango ]; nativeCheckInputs = [ @@ -83,6 +84,8 @@ stdenv.mkDerivation (finalAttrs: { passthru.providedSessions = [ "wayfire" ]; + passthru.tests.mate = nixosTests.mate-wayland; + meta = { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix index ce42f6fc68866..6fbe4b5575bba 100644 --- a/pkgs/applications/window-managers/wayfire/firedecor.nix +++ b/pkgs/applications/window-managers/wayfire/firedecor.nix @@ -5,17 +5,13 @@ , ninja , pkg-config , boost -, cairo , glib , libGL , libinput , librsvg , libxkbcommon -, pango , udev , wayfire -, wayland -, wf-config , xcbutilwm , mate }: @@ -39,17 +35,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost - cairo glib libGL libinput librsvg libxkbcommon - pango udev wayfire - wayland - wf-config xcbutilwm ]; diff --git a/pkgs/applications/window-managers/wayfire/focus-request.nix b/pkgs/applications/window-managers/wayfire/focus-request.nix new file mode 100644 index 0000000000000..41d5314172504 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/focus-request.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, pkg-config +, wayfire +, wf-config +, wayland +, pango +, libinput +, libxkbcommon +, librsvg +, libGL +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "focus-request"; + version = "0.8.0.2"; + + src = fetchFromGitLab { + owner = "wayfireplugins"; + repo = "focus-request"; + rev = "v${finalAttrs.version}"; + hash = "sha256-kUYvLC28IPrvnMT/wKFRlOVkc2ohF3k0T/Qrm/zVkpE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + wf-config + wayland + pango + libinput + libxkbcommon + librsvg + libGL + xcbutilwm + ]; + + env = { + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; + + meta = { + homepage = "https://gitlab.com/wayfireplugins/focus-request"; + description = "The wayfire plugin provides a mechanism to grant focus to views that make a focus self-request"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index b8af85aafd0da..e6663b477f711 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -5,9 +5,12 @@ lib.makeScope pkgs.newScope (self: inherit (self) callPackage; in { firedecor = callPackage ./firedecor.nix { }; + focus-request = callPackage ./focus-request.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; + wayfire-shadows = callPackage ./wayfire-shadows.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; windecor = callPackage ./windecor.nix { }; + wwp-switcher = callPackage ./wwp-switcher.nix { }; } ) diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 9652664443691..62496c9f86004 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -1,45 +1,31 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config , wayfire , wf-config -, gtkmm3 -, gtk-layer-shell , libevdev , libinput , libxkbcommon +, nlohmann_json , xcbutilwm +, gtkmm3 +, gtk-layer-shell }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-OVyP1AgZ1d9DXFkbHnROwtSQIquEX5ccVIkcmCdDZtA="; + hash = "sha256-MF4tDzIZnnTXH2ZUxltIw1RP3pfRQFGrc/n9H47yW0g"; }; - patches = [ - (fetchpatch { - name = "check-dependency-libevdev.patch"; - url = "https://github.com/WayfireWM/wayfire-plugins-extra/commit/f3bbf1fcbafd28016e36be7a5043bd82574ac9e4.patch"; - hash = "sha256-8X1lpf8H8NuA845cIslahKDQKW/IA/KiMExU4Snk72o="; - }) - ]; - - postPatch = '' - substituteInPlace metadata/meson.build \ - --replace "wayfire.get_variable(pkgconfig: 'metadatadir')" "join_paths(get_option('prefix'), 'share/wayfire/metadata')" - ''; - nativeBuildInputs = [ meson ninja @@ -52,12 +38,22 @@ stdenv.mkDerivation (finalAttrs: { libevdev libinput libxkbcommon + nlohmann_json xcbutilwm gtkmm3 gtk-layer-shell ]; - mesonFlags = [ "--sysconfdir /etc" ]; + mesonFlags = [ + # plugins in submodule, packaged individually + (lib.mesonBool "enable_windecor" false) + (lib.mesonBool "enable_wayfire_shadows" false) + (lib.mesonBool "enable_focus_request" false) + ]; + + env = { + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; meta = { homepage = "https://github.com/WayfireWM/wayfire-plugins-extra"; diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix new file mode 100644 index 0000000000000..fd91d78285dfe --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, meson +, ninja +, pkg-config +, wayfire +, libxkbcommon +, libGL +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wayfire-shadows"; + version = "unstable-2024-03-28"; + + src = fetchFromGitHub { + owner = "timgott"; + repo = "wayfire-shadows"; + rev = "81699f6e4be65dcf3f7ad5155dfb4247b37b7997"; + hash = "sha256-H9pqpHoeDfNBrtVLax57CUXVhU2XT+syAUZTYSJizxw="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + libxkbcommon + libGL + ]; + + env = { + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/timgott/wayfire-shadows"; + description = "Wayfire plugin that adds window shadows"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 1acd161e6211b..fec3b1bfc7163 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -4,11 +4,9 @@ , meson , ninja , pkg-config -, wayland , wrapGAppsHook , wayfire , wf-shell -, wf-config , wayland-scanner , wayland-protocols , gtk3 @@ -40,9 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config wf-shell - wayland wayland-protocols gtk3 gtkmm3 diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index b71e667b31ada..348ef56be5d89 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -6,7 +6,6 @@ , pkg-config , wayland-scanner , wayfire -, wf-config , alsa-lib , gtkmm3 , gtk-layer-shell @@ -35,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config alsa-lib gtkmm3 gtk-layer-shell diff --git a/pkgs/applications/window-managers/wayfire/windecor.nix b/pkgs/applications/window-managers/wayfire/windecor.nix index d3643aa180954..29c95ff1a91de 100644 --- a/pkgs/applications/window-managers/wayfire/windecor.nix +++ b/pkgs/applications/window-managers/wayfire/windecor.nix @@ -5,9 +5,6 @@ , ninja , pkg-config , wayfire -, wf-config -, wayland -, pango , eudev , libinput , libxkbcommon @@ -40,9 +37,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ wayfire - wf-config - wayland - pango eudev libinput libxkbcommon diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix new file mode 100644 index 0000000000000..9ca4718e17096 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, meson +, ninja +, pkg-config +, wayfire +, libxkbcommon +, libGL +, libinput +, gtk3 +, glibmm +, xcbutilwm +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wwp-switcher"; + version = "unstable-2023-09-09"; + + src = fetchFromGitHub { + owner = "wb9688"; + repo = "wwp-switcher"; + rev = "04711a0db133a899f507a86e81897296b793b4f3"; + hash = "sha256-qMyEhSZJNxAoaELKI2h1v59QJnKJzFa76Q4/WtZqpIU"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + wayfire + libxkbcommon + libGL + libinput + gtk3 + glibmm + xcbutilwm + ]; + + env = { + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/wb9688/wwp-switcher"; + description = "A plugin to switch active window"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rewine ]; + inherit (wayfire.meta) platforms; + }; +}) |